1
0
Fork 0
mutter-performance-source/gl
Neil Roberts c50935edca Fix building GLES 2 after the material branch merge
- In cogl-material.h it directly sets the values of the
  CoglMaterialLayerCombineFunc to some GL_* constants. However these
  aren't defined in GLES 2 beacuse it has no fixed function texture
  combining. Instead the CGL_* versions are now used. cogl-defines.h
  now sets these to either the GL_* version if it is available,
  otherwise it directly uses the number.

- Under GLES 2 cogl-material.c needs to access the CoglTexture struct
  so it needs to include cogl-texture-private.h

- There are now #define's in cogl-gles2-wrapper.h to remap the GL
  function names to the wrapper names. These are disabled in
  cogl-gles2-wrapper.c by defining COGL_GLES2_WRAPPER_NO_REMAP.

- Added missing wrappers for glLoadMatrixf and glMaterialfv.

- Renamed the TexEnvf wrapper to TexEnvi because the latter is used
  instead from the material API.
2009-02-02 21:57:41 +00:00
..
cogl-context.c Fallout from cogl-material merge 2009-01-27 16:02:04 +00:00
cogl-context.h Another Cogl gl vs gles normalizaion pass 2009-01-28 17:20:16 +00:00
cogl-defines.h.in Fix building GLES 2 after the material branch merge 2009-02-02 21:57:41 +00:00
cogl-fbo.c 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:25:00 +00:00
cogl-fbo.h Bug 945 - Clipping+fbo cloning bugs 2008-08-01 12:23:57 +00:00
cogl-internal.h Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
cogl-primitives.c Changes cogl_rectangle to take x1, y1, x2, y2 args not x1, y1, width, height 2009-01-28 17:20:15 +00:00
cogl-program.c 2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com> 2008-11-18 15:21:02 +00:00
cogl-program.h Removed COGLhandle and changed shader and program functions to be 2008-04-29 16:10:37 +00:00
cogl-shader-private.h 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:25:00 +00:00
cogl-shader.c 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 17:25:00 +00:00
cogl-texture-private.h Fully integrates CoglMaterial throughout the rest of Cogl 2009-01-27 14:26:39 +00:00
cogl-texture.c Another Cogl gl vs gles normalizaion pass 2009-01-28 17:20:16 +00:00
cogl.c [cogl] Add an NULL terminator to the call to material_flush_gl_state 2009-01-29 12:21:56 +00:00
Makefile.am Merge branch 'cogl-material' 2009-01-27 15:19:34 +00:00