From fa996734cff073a8acb7adb1d758059be25cb025 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 20 Feb 2009 16:37:20 +0000 Subject: [PATCH] [cogl-gles2-wrapper] Actually call glActiveTexture cogl_wrap_glActiveTexture needs to call the GL version of glActiveTexture otherwise the subsequent calls to glBindTexture will all be using texture unit 0. This fixes test-cogl-multitexture. --- clutter/cogl/gles/cogl-gles2-wrapper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clutter/cogl/gles/cogl-gles2-wrapper.c b/clutter/cogl/gles/cogl-gles2-wrapper.c index e7a4619f9..7f4ebbe92 100644 --- a/clutter/cogl/gles/cogl-gles2-wrapper.c +++ b/clutter/cogl/gles/cogl-gles2-wrapper.c @@ -1325,6 +1325,8 @@ cogl_wrap_glActiveTexture (GLenum texture) int texture_unit_index = texture - GL_TEXTURE0; _COGL_GET_GLES2_WRAPPER (w, NO_RETVAL); + glActiveTexture (texture); + if (texture_unit_index < COGL_GLES2_MAX_TEXTURE_UNITS) w->active_texture_unit = texture_unit_index; }