Don't use any GL types or defines in Clutter
authorNeil Roberts <neil@linux.intel.com>
Fri, 23 Mar 2012 17:12:26 +0000 (17:12 +0000)
committerNeil Roberts <neil@linux.intel.com>
Fri, 23 Mar 2012 17:24:42 +0000 (17:24 +0000)
commitc9a81f035e0ec2d5726497b986ab7469f4de7a74
tree39e8aaf3421bc639e0317b41aa976c0d45f894e3
parent04f2be34b2cba22acdb497feb5ecbcc3233ccc6a
Don't use any GL types or defines in Clutter

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>
13 files changed:
clutter/clutter-shader-effect.c
clutter/clutter-shader-types.c
clutter/clutter-stage.c
clutter/deprecated/clutter-shader.c
tests/conform/test-cogl-materials.c
tests/conform/test-cogl-premult.c
tests/conform/test-cogl-texture-rectangle.c
tests/conform/test-cogl-vertex-buffer-contiguous.c
tests/conform/test-cogl-vertex-buffer-interleved.c
tests/conform/test-cogl-vertex-buffer-mutability.c
tests/conform/test-conform-common.h
tests/interactive/test-cogl-tex-foreign.c
tests/interactive/test-cogl-vertex-buffer.c