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

build: Fix GLES builds since the material backend split

Browse Source 
The commit to split the fragment processing backends out from
cogl-material.c (3e1323a636) broke the GLES 1 and 2 builds the
fix was to guard the code in each backend according to the
COGL_MATERIAL_BACKEND_XYZ defines which are setup in
cogl-material-private.h.
This commit is contained in:
Robert Bragg 2010-07-02 01:07:36 +01:00
parent 9313f44e67
commit 70925a3194
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/cogl/cogl/cogl-material-arbfp.c
View File

@ -29,12 +29,15 @@
#include "config.h" #include "config.h"
#endif #endif
#include "cogl-material-private.h"
#ifdef COGL_MATERIAL_BACKEND_ARBFP
#include "cogl.h" #include "cogl.h"
#include "cogl-internal.h" #include "cogl-internal.h"
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-handle.h" #include "cogl-handle.h"
#include "cogl-material-private.h"
#include "cogl-texture-private.h" #include "cogl-texture-private.h"
#include "cogl-blend-string.h" #include "cogl-blend-string.h"
#include "cogl-journal-private.h" #include "cogl-journal-private.h"
@ -1027,3 +1030,5 @@ const CoglMaterialBackend _cogl_material_arbfp_backend =
NULL NULL
}; };
#endif /* COGL_MATERIAL_BACKEND_ARBFP */

7
clutter/cogl/cogl/cogl-material-fixed.c
View File

@ -29,12 +29,15 @@
#include "config.h" #include "config.h"
#endif #endif
#include "cogl-material-private.h"
#ifdef COGL_MATERIAL_BACKEND_FIXED
#include "cogl.h" #include "cogl.h"
#include "cogl-internal.h" #include "cogl-internal.h"
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-handle.h" #include "cogl-handle.h"
#include "cogl-material-private.h"
#include "cogl-texture-private.h" #include "cogl-texture-private.h"
#include "cogl-blend-string.h" #include "cogl-blend-string.h"
#include "cogl-profile.h" #include "cogl-profile.h"
@ -199,3 +202,5 @@ const CoglMaterialBackend _cogl_material_fixed_backend =
NULL /* free_priv */ NULL /* free_priv */
}; };
#endif /* COGL_MATERIAL_BACKEND_FIXED */

7
clutter/cogl/cogl/cogl-material-glsl.c
View File

@ -29,12 +29,15 @@
#include "config.h" #include "config.h"
#endif #endif
#include "cogl-material-private.h"
#ifdef COGL_MATERIAL_BACKEND_GLSL
#include "cogl.h" #include "cogl.h"
#include "cogl-internal.h" #include "cogl-internal.h"
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-handle.h" #include "cogl-handle.h"
#include "cogl-material-private.h"
#ifndef HAVE_COGL_GLES #ifndef HAVE_COGL_GLES
#include "cogl-program.h" #include "cogl-program.h"
#endif #endif
@ -121,3 +124,5 @@ const CoglMaterialBackend _cogl_material_glsl_backend =
NULL, /* free_priv */ NULL, /* free_priv */
}; };
#endif /* COGL_MATERIAL_BACKEND_GLSL */

2
clutter/cogl/cogl/cogl-material-private.h
View File

@ -28,6 +28,8 @@
#ifndef __COGL_MATERIAL_PRIVATE_H #ifndef __COGL_MATERIAL_PRIVATE_H
#define __COGL_MATERIAL_PRIVATE_H #define __COGL_MATERIAL_PRIVATE_H
#include "cogl.h"
#include "cogl-material.h" #include "cogl-material.h"
#include "cogl-matrix.h" #include "cogl-matrix.h"
#include "cogl-matrix-stack.h" #include "cogl-matrix-stack.h"