Advertisement
Guest User

Untitled

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