diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-07-01 20:34:59 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-07-01 20:39:57 +0100 |
| commit | 59d06d486d599525c4b301941b8a913cbf088da9 (patch) | |
| tree | fd8f92945ceb5df2d0a2776bdd6bd809f5e61bec /cogl/cogl-path.c | |
| parent | 7961b1c93dab6b334ce1d4dfdb6e2d1cb0f45d46 (diff) | |
| download | cogl-59d06d486d599525c4b301941b8a913cbf088da9.tar.gz | |
Fix building the tesselator code for GLES
The tesselator code uses some defines that it expects to be in the GL
headers such as GLAPI and GLAPIENTRY. These are used to mark the entry
points as exportable on each platform. We don't really want the
tesselator code to use these but we also don't want to modify the C
files so instead they are #defined to be empty in the stub glu.h. That
header is only included internally when building the tesselator/ files
so it shouldn't affect the rest of Cogl.
GLES also doesn't have a GLdouble type so we just #define this to be a
regular double.
Diffstat (limited to 'cogl/cogl-path.c')
| -rw-r--r-- | cogl/cogl-path.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cogl/cogl-path.c b/cogl/cogl-path.c index 687fdaa1..e035ccb4 100644 --- a/cogl/cogl-path.c +++ b/cogl/cogl-path.c @@ -1310,7 +1310,7 @@ _cogl_path_tesselator_end (CoglPathTesselator *tess) } static void -_cogl_path_tesselator_combine (GLdouble coords[3], +_cogl_path_tesselator_combine (double coords[3], void *vertex_data[4], GLfloat weight[4], void **out_data, @@ -1461,7 +1461,7 @@ _cogl_path_build_vbo (CoglPath *path) for (i = 0; i < node->path_size; i++) { - GLdouble vertex[3] = { node[i].x, node[i].y, 0.0 }; + double vertex[3] = { node[i].x, node[i].y, 0.0 }; gluTessVertex (tess.glu_tess, vertex, GINT_TO_POINTER (i + path_start)); } |