[Bf-blender-cvs] [9c87bb124a5] blender2.8: group WITH_LEGACY_OPENGL with the other GL options

Mike Erwin noreply at git.blender.org
Tue Apr 25 04:32:11 CEST 2017


Commit: 9c87bb124a57e84abe60a75ba68002a6cc2a68ac
Author: Mike Erwin
Date:   Mon Apr 24 17:41:26 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB9c87bb124a57e84abe60a75ba68002a6cc2a68ac

group WITH_LEGACY_OPENGL with the other GL options

Blender subsystems that care about OpenGL use GL_DEFINITIONS, which now includes the newest (temporary) WITH_LEGACY_OPENGL.

Also updated Gawain's CMake to use this instead of its own logic.

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

M	CMakeLists.txt
M	intern/gawain/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1c1a5eccbb..0b701cabedd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1074,6 +1074,10 @@ if(WITH_GL_EGL)
 
 endif()
 
+if(WITH_LEGACY_OPENGL)
+	list(APPEND GL_DEFINITIONS -DWITH_LEGACY_OPENGL)
+endif()
+
 if(WITH_GL_PROFILE_COMPAT)
 	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_COMPAT)
 endif()
diff --git a/intern/gawain/CMakeLists.txt b/intern/gawain/CMakeLists.txt
index bce0b1d4c3c..ac94cbb55d1 100644
--- a/intern/gawain/CMakeLists.txt
+++ b/intern/gawain/CMakeLists.txt
@@ -28,12 +28,6 @@ set(SRC
 	gawain/vertex_format.h
 )
 
-# remove this when we switch to core profile
-if(WITH_GL_PROFILE_COMPAT)
-	add_definitions(-DWITH_GL_PROFILE_COMPAT)
-	add_definitions(-DWITH_OPENGL_LEGACY)
-else()
-	add_definitions(-DWITH_GL_PROFILE_CORE)
-endif()
+add_definitions(${GL_DEFINITIONS})
 
 blender_add_lib(bf_intern_gawain "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list