Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From 00397a313c955ba567d003d88dc64fb57d8346fb Mon Sep 17 00:00:00 2001
- From: Neil Roberts <neil@linux.intel.com>
- Date: Thu, 4 Nov 2010 14:56:44 +0000
- Subject: [PATCH] cogl-gles2-wrapper: Fix a reference to the old name for CoglPipeline
- The GLES2 wrapper was referring to COGL_MATERIAL_PROGRAM_TYPE_GLSL but
- this has since been renamed to COGL_PIPELINE_PROGRAM_TYPE_GLSL so the
- GLES2 backend wouldn't compile.
- ---
- clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
- diff --git a/clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c b/clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c
- index 94befeb..0328720 100644
- --- a/clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c
- +++ b/clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c
- @@ -1126,7 +1126,7 @@ _cogl_wrap_prepare_for_draw (void)
- again in the _start function. This should go away once the GLSL
- code is generated in the GLSL material backend so it's probably
- not worth worrying about now */
- - _cogl_use_program (program->program, COGL_MATERIAL_PROGRAM_TYPE_GLSL);
- + _cogl_use_program (program->program, COGL_PIPELINE_PROGRAM_TYPE_GLSL);
- /* Make sure all of the uniforms are up to date */
- if (w->dirty_uniforms)
- --
- 1.7.3.16.g9464b
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement