[Bf-blender-cvs] [26e171c4d95] blender2.8: OpenGL: don't require legacy extensions when using WITH_GL_PROFILE_CORE

Mike Erwin noreply at git.blender.org
Tue Apr 18 21:09:33 CEST 2017


Commit: 26e171c4d95f051b15d2f586edf1a49d570ba31c
Author: Mike Erwin
Date:   Tue Apr 18 14:44:57 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB26e171c4d95f051b15d2f586edf1a49d570ba31c

OpenGL: don't require legacy extensions when using WITH_GL_PROFILE_CORE

These checks guarantee we meet the minimum expected GL requirements listed in T49012.

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

M	source/blender/gpu/intern/gpu_extensions.c

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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 23d51e5d5a3..a1df861d699 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -143,7 +143,7 @@ void gpu_extensions_init(void)
 	 * final 2.8 release will be unified on OpenGL 3.3 core profile, no required extensions
 	 * see developer.blender.org/T49012 for details
 	 */
-#ifdef _WIN32
+#if defined(WITH_GL_PROFILE_CORE) || defined(_WIN32)
 	BLI_assert(GLEW_VERSION_3_3);
 #elif defined(__APPLE__)
 	BLI_assert(GLEW_VERSION_2_1 && GLEW_EXT_gpu_shader4




More information about the Bf-blender-cvs mailing list