[Bf-blender-cvs] [6f0cf4a8040] blender2.8: support OpenGL 3.0 on Linux only when WITH_LEGACY_OPENGL=ON

Mike Erwin noreply at git.blender.org
Thu Apr 27 15:32:00 CEST 2017


Commit: 6f0cf4a80403a7858fb4202ea54a9ccfffca420f
Author: Mike Erwin
Date:   Wed Apr 26 17:23:43 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB6f0cf4a80403a7858fb4202ea54a9ccfffca420f

support OpenGL 3.0 on Linux only when WITH_LEGACY_OPENGL=ON

Part of T49012

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

M	intern/ghost/intern/GHOST_WindowX11.cpp

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

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index f39f4f52289..7dc3f917fde 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1376,6 +1376,7 @@ GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type
 		else
 			delete context;
 
+#ifdef WITH_LEGACY_OPENGL
 		// since that failed try 3.0 (mostly for Mesa, which doesn't implement compatibility profile)
 		context = new GHOST_ContextGLX(
 		        m_wantStereoVisual,
@@ -1393,6 +1394,7 @@ GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type
 			return context;
 		else
 			delete context;
+#endif // WITH_LEGACY_OPENGL
 	}
 
 	return NULL;




More information about the Bf-blender-cvs mailing list