[Bf-blender-cvs] [2e56e1415a0] blender2.8: OpenGL: remove EXT_geometry_shader4 from OpenSubdiv
Mike Erwin
noreply at git.blender.org
Fri May 19 00:31:46 CEST 2017
Commit: 2e56e1415a0db11c5bf93cd517ff12bf3df43a5a
Author: Mike Erwin
Date: Thu May 18 17:32:39 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB2e56e1415a0db11c5bf93cd517ff12bf3df43a5a
OpenGL: remove EXT_geometry_shader4 from OpenSubdiv
Old extension was made obsolete by GL 3.2.
Input/output layout is part of GLSL.
===================================================================
M intern/opensubdiv/opensubdiv_gpu_capi.cc
===================================================================
diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index d6b30b9bfe3..8b48b526ccc 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -275,24 +275,6 @@ GLuint linkProgram(const char *version, const char *define)
glBindAttribLocation(program, 0, "position");
glBindAttribLocation(program, 1, "normal");
-
- if (!GLEW_VERSION_3_2) {
- /* provide input/output layout info */
- glProgramParameteriEXT(program,
- GL_GEOMETRY_INPUT_TYPE_EXT,
- GL_LINES_ADJACENCY_EXT);
-
- bool wireframe = strstr(define, "WIREFRAME") != NULL;
-
- glProgramParameteriEXT(program,
- GL_GEOMETRY_OUTPUT_TYPE_EXT,
- wireframe ? GL_LINE_STRIP : GL_TRIANGLE_STRIP);
-
- glProgramParameteriEXT(program,
- GL_GEOMETRY_VERTICES_OUT_EXT,
- 8);
- }
-
glLinkProgram(program);
glDeleteShader(vertexShader);
More information about the Bf-blender-cvs
mailing list