diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-10-16 10:18:17 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-10-16 10:18:17 +0300 |
| commit | 3999910b199f099466bc405ae87cb940f2509efa (patch) | |
| tree | 63a2f2acefb9f79ad59a276041accbd7718469c2 /source/blender/gpu/intern/gpu_extensions.c | |
| parent | 1deab69e0a60413b3d3fef41ae74873d1e8b0a53 (diff) | |
OpenGL: add GLSL #version 330, drop 140 and 150
GL 3.3 is the new minimum. Compatibility profile for now, core profile eventually. During development, GL 3.0 (on Mesa) and 2.1 (on Mac) will still work.
Part of T49012
Diffstat (limited to 'source/blender/gpu/intern/gpu_extensions.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 51f1ee2b5e6..52aab419e03 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -129,18 +129,18 @@ void GPU_get_dfdy_factors(float fac[2]) void gpu_extensions_init(void) { /* during 2.8 development each platform has its own OpenGL minimum requirements - * final 2.8 release will be unified on OpenGL 3.2 core profile, no required extensions + * 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 - BLI_assert(GLEW_VERSION_3_2); + BLI_assert(GLEW_VERSION_3_3); #elif defined(__APPLE__) BLI_assert(GLEW_VERSION_2_1 && GLEW_EXT_gpu_shader4 && GLEW_ARB_framebuffer_object && GLEW_ARB_draw_elements_base_vertex && GLEW_APPLE_flush_buffer_range); #else - BLI_assert(GLEW_VERSION_3_2 || (GLEW_VERSION_3_0 && GLEW_ARB_draw_elements_base_vertex)); + BLI_assert(GLEW_VERSION_3_3 || (GLEW_VERSION_3_0 && GLEW_ARB_draw_elements_base_vertex)); /* vendor driver || Mesa compatibility profile */ #endif @@ -257,6 +257,8 @@ void gpu_extensions_exit(void) bool GPU_legacy_support(void) { /* return whether or not current GL context is compatible with legacy OpenGL */ + /* (will be removed after switching to core profile) */ + static bool checked = false; static bool support = true; |