Neil Roberts
e88de5f5fd
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
..
2009-02-02 21:57:41 +00:00
2009-01-16 22:13:44 +00:00
2008-10-30 17:04:34 +00:00
2008-10-30 17:04:34 +00:00
2009-01-14 15:04:28 +00:00
2008-04-09 14:18:42 +00:00
2008-10-30 17:04:34 +00:00
2009-01-28 17:20:15 +00:00
2008-10-30 17:04:34 +00:00
2008-10-30 17:04:34 +00:00
2009-02-02 07:37:08 +00:00
2009-02-02 12:07:28 +00:00
2009-02-02 12:07:28 +00:00
2009-01-20 18:47:50 +00:00
2009-01-20 18:47:50 +00:00
2009-01-08 13:18:00 +00:00
2009-01-08 13:18:00 +00:00
2009-01-20 16:42:49 +00:00
2009-01-16 14:37:42 +00:00
2009-01-22 11:42:11 +00:00
2008-12-23 15:03:11 +00:00
2009-01-23 13:08:46 +00:00
2008-10-30 17:04:34 +00:00
2009-01-24 14:32:10 +00:00
2008-10-30 17:04:34 +00:00
2009-01-20 16:42:49 +00:00
2008-10-30 17:04:34 +00:00
2009-01-20 16:42:49 +00:00
2008-12-05 13:13:37 +00:00
2009-01-23 18:41:41 +00:00
2008-10-30 17:04:34 +00:00
2009-01-23 18:41:40 +00:00
2008-10-30 17:04:34 +00:00
2009-01-24 14:32:09 +00:00
2009-01-20 16:42:49 +00:00
2009-01-20 16:20:54 +00:00
2008-12-05 13:13:37 +00:00
2009-01-13 12:51:03 +00:00
2009-01-14 15:03:30 +00:00
2008-12-19 17:48:30 +00:00
2009-01-09 14:26:35 +00:00
2008-08-06 10:20:57 +00:00
2008-10-30 17:04:34 +00:00
2009-02-02 12:07:29 +00:00
2009-01-27 14:24:31 +00:00
2009-01-20 16:20:54 +00:00
2008-10-30 17:04:34 +00:00
2008-10-16 10:28:17 +00:00
2008-10-30 17:04:34 +00:00
2008-11-18 09:50:03 +00:00
2009-01-28 16:24:02 +00:00
2007-12-25 11:41:10 +00:00
2007-08-20 20:16:15 +00:00
2008-12-08 13:57:10 +00:00
2009-01-21 22:03:31 +00:00
2008-06-06 13:44:22 +00:00
2008-10-30 17:04:34 +00:00
2009-01-20 16:20:54 +00:00
2009-01-20 16:20:55 +00:00
2008-05-09 16:27:06 +00:00
2008-10-30 17:04:34 +00:00
2008-11-26 16:46:48 +00:00
2008-10-30 17:04:34 +00:00
2008-03-09 19:07:17 +00:00
2008-10-30 17:04:34 +00:00
2009-01-23 12:10:50 +00:00
2009-01-08 11:15:09 +00:00
2008-04-23 13:58:58 +00:00
2008-06-10 06:37:46 +00:00
2008-08-05 10:54:40 +00:00
2008-03-19 18:33:33 +00:00
2008-10-30 17:04:34 +00:00
2009-01-27 17:11:02 +00:00
2009-01-27 14:43:44 +00:00
2009-01-20 16:42:49 +00:00
2009-01-20 23:40:25 +00:00
2009-01-20 23:40:25 +00:00
2008-01-09 14:18:53 +00:00
2008-07-30 10:32:25 +00:00
2008-10-30 17:04:34 +00:00
2009-01-20 16:20:54 +00:00
2008-12-21 21:52:50 +00:00
2009-01-27 17:11:02 +00:00
2009-01-28 17:20:15 +00:00
2008-10-30 17:04:34 +00:00
2008-11-25 13:19:48 +00:00
2008-10-30 17:04:34 +00:00
2008-08-04 16:21:27 +00:00
2008-08-04 16:21:27 +00:00
2009-01-20 18:24:58 +00:00
2008-10-30 17:04:34 +00:00
2007-11-14 11:32:24 +00:00
2008-10-30 17:04:34 +00:00
2008-11-18 15:08:40 +00:00
2008-11-18 15:08:40 +00:00
2008-11-18 15:08:40 +00:00
2008-11-18 15:08:40 +00:00
2008-06-03 20:15:11 +00:00
2008-10-30 17:04:34 +00:00
2008-04-04 15:02:11 +00:00
2008-10-30 17:04:34 +00:00
2009-01-26 10:58:40 +00:00
2009-01-23 15:16:21 +00:00
2009-02-02 12:07:29 +00:00
2009-02-02 12:07:28 +00:00
2009-01-27 15:19:34 +00:00
2009-01-27 16:40:51 +00:00
2009-01-27 11:25:06 +00:00
2008-10-30 17:04:34 +00:00
2008-09-23 13:25:31 +00:00
2008-10-30 17:04:34 +00:00
2009-01-27 14:43:44 +00:00
2009-01-22 12:11:25 +00:00
2009-01-21 17:35:47 +00:00
2008-02-12 17:17:52 +00:00
2008-10-30 17:04:34 +00:00
2008-03-31 17:15:02 +00:00
2009-01-27 15:18:45 +00:00
2009-01-27 16:14:35 +00:00