[Bf-blender-cvs] [701a76769d4] blender2.8: Fixup for gawan rename

[Dalai Felinto]

Commit: 701a76769d4acb2dfda14a8fe2ef18ebd805d91c
Author: Dalai Felinto
Date:   Mon Jun 19 15:19:00 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB701a76769d4acb2dfda14a8fe2ef18ebd805d91c

Fixup for gawan rename

inten/opencolorio and *.cc were ignored.

Build error introduced on b4d053efc75424fca4b413ac1bc7a7e826fac629.

===================================================================

M	intern/opencolorio/ocio_impl_glsl.cc

===================================================================

diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index 89df3080749..b89221c36da 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -95,7 +95,7 @@ typedef struct OCIO_GLSLDrawState {
 	GLuint ocio_shader;
 	GLuint vert_shader;
 	GLuint program;
-	ShaderInterface *shader_interface;
+	Gwn_ShaderInterface *shader_interface;
 
 	/* Previous OpenGL state. */
 	GLint last_texture, last_texture_unit;
@@ -397,7 +397,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRc
 		}
 
 		if (state->program) {
-			state->shader_interface = ShaderInterface_create(state->program);
+			state->shader_interface = GWN_shaderinterface_create(state->program);
 		}
 
 		state->curve_mapping_used = use_curve_mapping;
@@ -424,9 +424,9 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRc
 		 *
 		 * TODO(sergey): Look into some nicer solution.
 		 */
-		VertexFormat *format = immVertexFormat();
-		VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT);
-		VertexFormat_add_attrib(format, "texCoord", COMP_F32, 2, KEEP_FLOAT);
+		Gwn_VertFormat *format = immVertexFormat();
+		GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
+		GWN_vertformat_attr_add(format, "texCoord", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 		immBindProgram(state->program, state->shader_interface);
 
 		immUniform1i("image_texture", 0);
@@ -497,7 +497,7 @@ void OCIOImpl::freeGLState(struct OCIO_GLSLDrawState *state)
 		glDeleteProgram(state->program);
 
 	if (state->shader_interface)
-		ShaderInterface_discard(state->shader_interface);		
+		GWN_shaderinterface_discard(state->shader_interface);		
 
 	if (state->ocio_shader)
 		glDeleteShader(state->ocio_shader);