[Bf-blender-cvs] [f1ad348] blender2.8: get latest OpenGL version on Windows + AMD

Mike Erwin noreply at git.blender.org
Sun Aug 14 07:27:43 CEST 2016


Commit: f1ad3483af374c9c2ddc1ad4f65b28745c8224a1
Author: Mike Erwin
Date:   Sun Aug 14 01:27:00 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBf1ad3483af374c9c2ddc1ad4f65b28745c8224a1

get latest OpenGL version on Windows + AMD

When we ask for GL 3.2 compatibility profile:
AMD (Radeon HD 6970) gives us exactly this version
NVIDIA (Quadro K600) gives at least this version
Still need to check Intel behavior

We want *at least* the version requested, plus more recent features if
available.

Both GPUs tested & mentioned above are capable of GL 4.5. With this
commit they both give 4.5 to Blender.

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 3bf3c94..32bdbe6 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -627,7 +627,17 @@ GHOST_Context *GHOST_WindowWin32::newDrawingContext(GHOST_TDrawingContextType ty
 		        m_hWnd,
 		        m_hDC,
 		        profile_mask,
-		        3, 2, // GL version requested
+#if 0
+		        3, 2, // specific GL version requested
+		              // AMD gives us exactly this version
+		              // NVIDIA gives at least this version <-- desired behavior
+#else
+		        2, 1, // any GL version >= 2.1 (hopefully the latest)
+		              // we check later to ensure it's >= 3.2 on Windows
+		              // TODO(merwin): fix properly!
+		              //               2.1 ignores the profile bit & is incompatible with core profile
+		              //               query version of initial dummy context, request that + profile + debug
+#endif
 		        (m_debug_context ? WGL_CONTEXT_DEBUG_BIT_ARB : 0),
 		        GHOST_OPENGL_WGL_RESET_NOTIFICATION_STRATEGY);




More information about the Bf-blender-cvs mailing list