gles2: Remove the special wrapper for glBindTexture
authorNeil Roberts <neil@linux.intel.com>
Wed, 24 Feb 2010 11:13:55 +0000 (11:13 +0000)
committerNeil Roberts <neil@linux.intel.com>
Thu, 25 Feb 2010 12:50:52 +0000 (12:50 +0000)
commit14999bec5e6b3d0aab057ef544f233d968e5cf67
tree9aba3b3d3fcda4ad95d75130abe66be74eaa8fe3
parenteba07020c549ff0ede9982c6d911d67e353ca5a3
gles2: Remove the special wrapper for glBindTexture

Previously the GLES2 backend needed a special wrapper for
glBindTexture because it needed to know the internal GL format of the
texture in order to correctly implement the GL_MODULATE texture env
mode. When GL_MODULATE is used then the RGB values are taken from the
previous texture layer rather than being fetched from the
texture. However since the material API was added Cogl no longer uses
the GL_MODULATE texture env mode but instead always uses GL_COMBINE.

Compiling the GLES2 backend broke since the more-texture-backends
branch merge because the cogl_get_internal_gl_format function was
removed and there was one place in GLES2 specific code that was using
this to bind the texture.
clutter/cogl/cogl/cogl-material.c
clutter/cogl/cogl/cogl-texture-2d-sliced.c
clutter/cogl/cogl/cogl-texture-driver.h
clutter/cogl/cogl/driver/gl/cogl-texture-driver.c
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.c
clutter/cogl/cogl/driver/gles/cogl-gles2-wrapper.h
clutter/cogl/cogl/driver/gles/cogl-texture-driver.c