Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-04-08 09:21:13 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-08 09:21:13 +0300
commitf60626e3a633ce8506cbc12310b42b60ade5f95e (patch)
tree576ba9d1d4de92054c325c0f4da324ddd241dd72 /source/blender/gpu/intern/gpu_extensions.c
parentd5883bb1ba6e4cfdd70bd3b8c0531a22c616b1be (diff)
OpenGL: drop support for EXT_geometry_shader4
See gpu_shader.c for the main changes. EXT_geometry_shader4 brought this feature to GL versions < 3.2, but now it's just cluttering up our code. Soon all platforms will be on version 3.3 so we won't even have to check support at runtime!
Diffstat (limited to 'source/blender/gpu/intern/gpu_extensions.c')
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index d7ed65e853e..175fb9de041 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -61,7 +61,6 @@
* EXT_framebuffer_multisample_blit_scaled: ???
* ARB_draw_instanced: 3.1
* ARB_texture_multisample: 3.2
- * EXT_geometry_shader4: 3.2
* ARB_texture_query_lod: 4.0
*/
@@ -334,16 +333,10 @@ bool GPU_bicubic_bump_support(void)
bool GPU_geometry_shader_support(void)
{
- /* in GL 3.2 geometry shaders are fully supported
+ /* starting with GL 3.2 geometry shaders are fully supported
* core profile clashes with our other shaders so accept compatibility only
- * other GL versions can use EXT_geometry_shader4 if available
*/
- return (GLEW_VERSION_3_2 && GPU_legacy_support()) || GLEW_EXT_geometry_shader4;
-}
-
-bool GPU_geometry_shader_support_via_extension(void)
-{
- return GLEW_EXT_geometry_shader4 && !(GLEW_VERSION_3_2 && GPU_legacy_support());
+ return GLEW_VERSION_3_2 && GPU_legacy_support();
}
bool GPU_instanced_drawing_support(void)