mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 20:32:16 +00:00
c50935edca
- 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. |
||
|---|---|---|
| .. | ||
| cogl-context.c | ||
| cogl-context.h | ||
| cogl-defines.h.in | ||
| cogl-fbo.c | ||
| cogl-fbo.h | ||
| cogl-fixed-fragment-shader.glsl | ||
| cogl-fixed-vertex-shader.glsl | ||
| cogl-gles2-wrapper.c | ||
| cogl-gles2-wrapper.h | ||
| cogl-internal.h | ||
| cogl-primitives.c | ||
| cogl-program.c | ||
| cogl-program.h | ||
| cogl-shader-private.h | ||
| cogl-shader.c | ||
| cogl-texture-private.h | ||
| cogl-texture.c | ||
| cogl-util.c | ||
| cogl-util.h | ||
| cogl.c | ||
| Makefile.am | ||
| stringify.sh | ||