Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: do not support legacy matrix when using core profile

Browse Source
This commit is contained in:
Dalai Felinto
2017-04-13 16:49:39 +02:00
parent 257e6c0c7d
commit fe559d0659
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -464,7 +464,7 @@ option(WITH_GLEW_MX "Support multiple GLEW contexts (experimental)"
option(WITH_GLEW_ES "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF) 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_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_COMPAT "Support using the OpenGL 'compatibility' profile. (deprecated)" ON )
option(WITH_GL_PROFILE_CORE "Support using the OpenGL 3.2+ 'core' profile." OFF) 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) 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( mark_as_advanced(

6
source/blender/gpu/GPU_matrix.h
View File

@@ -43,7 +43,11 @@ extern "C" {
/* For now we support the legacy matrix stack in gpuGetMatrix functions. /* For now we support the legacy matrix stack in gpuGetMatrix functions.
* Will remove this after switching to core profile, which can happen after * Will remove this after switching to core profile, which can happen after
* we convert all code to use the API in this file. */ * we convert all code to use the API in this file. */
#define SUPPORT_LEGACY_MATRIX 1 #ifdef WITH_GL_PROFILE_CORE
#define SUPPORT_LEGACY_MATRIX 0
#else
#define SUPPORT_LEGACY_MATRIX 1
#endif
/* implement 2D parts with 4x4 matrices, even though 3x3 feels better /* implement 2D parts with 4x4 matrices, even though 3x3 feels better
* this is a compromise to get core profile up & running sooner * this is a compromise to get core profile up & running sooner