brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-pipeline-opengl: #ifdef out set_glsl_program for GLES 1.1

Browse Source 
glUseProgram is not available under GLES 1.1 so it was breaking the
build.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2516
This commit is contained in:
Neil Roberts 2011-01-17 12:20:06 +00:00
parent 568d32acf3
commit b7677d047d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/cogl/cogl/cogl-pipeline-opengl.c
View File

@ -252,9 +252,16 @@ _cogl_pipeline_texture_storage_change_notify (CoglHandle texture)
* we continue to check the rest */ * we continue to check the rest */
} }
} }
static void static void
set_glsl_program (GLuint gl_program) set_glsl_program (GLuint gl_program)
{ {
#ifdef HAVE_COGL_GLES
g_return_if_reached ();
#else /* HAVE_COGL_GLES */
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->current_gl_program != gl_program) if (ctx->current_gl_program != gl_program)
@ -272,6 +279,8 @@ set_glsl_program (GLuint gl_program)
ctx->current_gl_program = 0; ctx->current_gl_program = 0;
} }
} }
#endif /* HAVE_COGL_GLES */
} }
void void