[Bf-blender-cvs] [77f8d631b1f] blender2.8: OpenSubdiv: insert TODO notes for OpenGL
Mike Erwin
noreply at git.blender.org
Fri May 19 00:31:47 CEST 2017
Commit: 77f8d631b1f6479b6e5b3b99ecb3611fca519444
Author: Mike Erwin
Date: Thu May 18 17:45:31 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB77f8d631b1f6479b6e5b3b99ecb3611fca519444
OpenSubdiv: insert TODO notes for OpenGL
===================================================================
M intern/opensubdiv/opensubdiv_gpu_capi.cc
===================================================================
diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index 8b48b526ccc..681fc319dce 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -296,6 +296,7 @@ GLuint linkProgram(const char *version, const char *define)
glGetUniformBlockIndex(program, "Lighting"),
0);
+ /* TODO: use glUseProgram, glUniform */
glProgramUniform1i(program,
glGetUniformLocation(program, "texture_buffer"),
0); /* GL_TEXTURE0 */
@@ -357,6 +358,7 @@ void bindProgram(OpenSubdiv_GLMesh *gl_mesh, int program)
}
#else
{
+ /* TODO: stop using glGetMaterial */
float color[4];
glGetMaterialfv(GL_FRONT, GL_DIFFUSE, color);
glUniform4fv(glGetUniformLocation(program, "diffuse"), 1, color);
@@ -533,6 +535,7 @@ void openSubdiv_osdGLMeshDisplayPrepare(int use_osd_glsl,
g_lighting_data.num_enabled++;
}
+ /* TODO: stop using glGetLight */
glGetLightfv(GL_LIGHT0 + i,
GL_POSITION,
g_lighting_data.lights[i].position);
More information about the Bf-blender-cvs
mailing list