[Bf-blender-cvs] [c8ab7d46566] blender2.8: Force core profile as main profile
Dalai Felinto
noreply at git.blender.org
Thu May 11 16:47:52 CEST 2017
Commit: c8ab7d46566c4a65c6176cd2ebe27778512f7fef
Author: Dalai Felinto
Date: Thu May 11 16:38:05 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc8ab7d46566c4a65c6176cd2ebe27778512f7fef
Force core profile as main profile
This removes a few options from CMake:
* WITH_LEGACY_OPENGL
* WITH_GL_PROFILE_COMPAT
* WITH_GL_PROFILE_CORE
We still have WITH_GL_PROFILE_ES20. So you can still alternate between
ES20 and CORE profile (when es20 is disabled).
If you want to explicitly see the stubs errors just define
WITH_LEGACY_OPENGL.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce39e8214b9..66ac6e450bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,8 +244,6 @@ option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ${_init_OPENCOLO
option(WITH_CLAY_ENGINE "Enable New Clay engine (Breaks Mac and Mesa compatibility)" ON)
-option(WITH_LEGACY_OPENGL "Enable build of legacy OpenGL" ON)
-
# Compositor
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
@@ -468,15 +466,11 @@ endif()
option(WITH_GLEW_ES "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
option(WITH_GL_EGL "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)" OFF)
-option(WITH_GL_PROFILE_COMPAT "Support using the OpenGL 'compatibility' profile. (deprecated)" ON )
-option(WITH_GL_PROFILE_CORE "Support using the OpenGL 3.3+ 'core' profile." OFF)
option(WITH_GL_PROFILE_ES20 "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)" OFF)
mark_as_advanced(
WITH_GLEW_ES
WITH_GL_EGL
- WITH_GL_PROFILE_COMPAT
- WITH_GL_PROFILE_CORE
WITH_GL_PROFILE_ES20
)
@@ -960,10 +954,7 @@ if(WITH_SYSTEM_GLES)
find_package_wrapper(OpenGLES)
endif()
-if(WITH_GL_PROFILE_COMPAT OR WITH_GL_PROFILE_CORE)
- list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
-
-elseif(WITH_GL_PROFILE_ES20)
+if(WITH_GL_PROFILE_ES20)
if(WITH_SYSTEM_GLES)
if(NOT OPENGLES_LIBRARY)
message(FATAL_ERROR
@@ -1023,6 +1014,9 @@ elseif(WITH_GL_PROFILE_ES20)
endif()
+else()
+ list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+
endif()
if(WITH_GL_EGL)
@@ -1070,20 +1064,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()
-
-if(WITH_GL_PROFILE_CORE)
- list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
-endif()
-
if(WITH_GL_PROFILE_ES20)
list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_ES20)
+else()
+ list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
endif()
if(WITH_GL_EGL)
@@ -1137,12 +1121,11 @@ else()
list(APPEND GL_DEFINITIONS -DGLEW_STATIC -DWITH_GLEW_ES)
# These definitions remove APIs from glew.h, making GLEW smaller, and catching unguarded API usage
- if(NOT WITH_GL_PROFILE_ES20)
+ if(WITH_GL_PROFILE_ES20)
+ list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
+ else()
# No ES functions are needed
list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
- elseif(NOT (WITH_GL_PROFILE_CORE OR WITH_GL_PROFILE_COMPAT))
- # ES is enabled, but the other functions are all disabled
- list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
endif()
if(WITH_GL_PROFILE_ES20)
@@ -1715,8 +1698,6 @@ if(FIRST_RUN)
info_cfg_text("OpenGL:")
info_cfg_option(WITH_GLEW_ES)
info_cfg_option(WITH_GL_EGL)
- info_cfg_option(WITH_GL_PROFILE_COMPAT)
- info_cfg_option(WITH_GL_PROFILE_CORE)
info_cfg_option(WITH_GL_PROFILE_ES20)
if(WIN32)
info_cfg_option(WITH_GL_ANGLE)
More information about the Bf-blender-cvs
mailing list