Fixup for gawan rename
inten/opencolorio and *.cc were ignored. Build error introduced on b4d053efc75424fca4b413ac1bc7a7e826fac629.
This commit is contained in:
parent
54c9803e81
commit
701a76769d
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user