brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use any GL types or defines in Clutter

Browse Source 
Some of the Clutter code was using GL types for the primitive types
such as GLint and GLubyte and then passing these to Cogl. This doesn't
make much sense because the Cogl functions directly take native C
types. This patch just replaces them with either a native C type or a
glib type.

Some of the cogl conformance tests are trying to directly call GL for
example to test creating a foreign texture. These tests have been
changed to manually define the GL enum values instead of relying on a
GL header to define them.

This is necessary because Cogl may soon stop including a GL header
from its public headers.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Neil Roberts
2012-03-23 17:12:26 +00:00
parent 04f2be34b2
commit c9a81f035e
13 changed files with 167 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter-shader-types.c
View File

@ -82,19 +82,19 @@ static GTypeFundamentalInfo shader_matrix_finfo = { 0, };
struct _ClutterShaderFloat
{
gint size;
GLfloat value[4];
float value[4];
};
struct _ClutterShaderInt
{
gint size;
GLint value[4];
int value[4];
};
struct _ClutterShaderMatrix
{
gint size;
GLfloat value[16];
float value[16];
};
static gpointer
@ -436,7 +436,7 @@ clutter_value_set_shader_int (GValue *value,
shader_int->size = size;
for (i = 0; i < size; i++)
shader_int->value[i] = (GLint) ints[i];
shader_int->value[i] = ints[i];
}
/**