projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
568d32a
)
cogl-pipeline-opengl: #ifdef out set_glsl_program for GLES 1.1
author
Neil Roberts
<neil@linux.intel.com>
Mon, 17 Jan 2011 12:20:06 +0000
(12:20 +0000)
committer
Neil Roberts
<neil@linux.intel.com>
Mon, 17 Jan 2011 12:38:46 +0000
(12:38 +0000)
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
patch
|
blob
|
history
diff --git
a/clutter/cogl/cogl/cogl-pipeline-opengl.c
b/clutter/cogl/cogl/cogl-pipeline-opengl.c
index
16622d2
..
d556705
100644
(file)
--- 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