From b7677d047df6b8c96605454717873bbcb1722763 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 17 Jan 2011 12:20:06 +0000 Subject: [PATCH] cogl-pipeline-opengl: #ifdef out set_glsl_program for GLES 1.1 glUseProgram is not available under GLES 1.1 so it was breaking the build. http://bugzilla.clutter-project.org/show_bug.cgi?id=2516 --- clutter/cogl/cogl/cogl-pipeline-opengl.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/clutter/cogl/cogl/cogl-pipeline-opengl.c b/clutter/cogl/cogl/cogl-pipeline-opengl.c index 16622d2d8..d556705ae 100644 --- a/clutter/cogl/cogl/cogl-pipeline-opengl.c +++ b/clutter/cogl/cogl/cogl-pipeline-opengl.c @@ -252,9 +252,16 @@ _cogl_pipeline_texture_storage_change_notify (CoglHandle texture) * we continue to check the rest */ } } + static void set_glsl_program (GLuint gl_program) { +#ifdef HAVE_COGL_GLES + + g_return_if_reached (); + +#else /* HAVE_COGL_GLES */ + _COGL_GET_CONTEXT (ctx, NO_RETVAL); if (ctx->current_gl_program != gl_program) @@ -272,6 +279,8 @@ set_glsl_program (GLuint gl_program) ctx->current_gl_program = 0; } } + +#endif /* HAVE_COGL_GLES */ } void