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

cogl: Adds a COGL_FEATURE_SHADERS_ARBFP feature flag

Browse Source 
This adds a public feature flag for ARBfp so developers can determine if
the cogl API supports ARBfp or not.
This commit is contained in:
Robert Bragg 2010-08-05 10:59:03 +01:00
parent f781bcec7e
commit 5741e28cdc
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/cogl/cogl/cogl-internal.h
View File

@ -219,7 +219,7 @@ _cogl_xlib_remove_filter (CoglXlibFilterFunc func,
typedef enum _CoglFeatureFlagsPrivate typedef enum _CoglFeatureFlagsPrivate
{ {
COGL_FEATURE_PRIVATE_ARB_FP = (1 << 0) COGL_FEATURE_PRIVATE_PLACE_HOLDER = (1 << 0)
} CoglFeatureFlagsPrivate; } CoglFeatureFlagsPrivate;
gboolean gboolean

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

@ -256,7 +256,7 @@ _cogl_material_backend_arbfp_start (CoglMaterial *material,
_COGL_GET_CONTEXT (ctx, FALSE); _COGL_GET_CONTEXT (ctx, FALSE);
if (!_cogl_features_available_private (COGL_FEATURE_PRIVATE_ARB_FP)) if (!cogl_features_available (COGL_FEATURE_SHADERS_ARBFP))
return FALSE; return FALSE;
/* TODO: support fog */ /* TODO: support fog */

4
clutter/cogl/cogl/cogl-types.h
View File

@ -226,6 +226,7 @@ typedef enum { /*< prefix=COGL_PIXEL_FORMAT >*/
* @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support * @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support
* @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support * @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support
* @COGL_FEATURE_SHADERS_GLSL: GLSL support * @COGL_FEATURE_SHADERS_GLSL: GLSL support
* @COGL_FEATURE_SHADERS_ARBFP: ARBFP support
* @COGL_FEATURE_OFFSCREEN: FBO support * @COGL_FEATURE_OFFSCREEN: FBO support
* @COGL_FEATURE_OFFSCREEN_MULTISAMPLE: Multisample support on FBOs * @COGL_FEATURE_OFFSCREEN_MULTISAMPLE: Multisample support on FBOs
* @COGL_FEATURE_OFFSCREEN_BLIT: Blit support on FBOs * @COGL_FEATURE_OFFSCREEN_BLIT: Blit support on FBOs
@ -276,7 +277,8 @@ typedef enum
COGL_FEATURE_TEXTURE_NPOT_MIPMAP = (1 << 16), COGL_FEATURE_TEXTURE_NPOT_MIPMAP = (1 << 16),
COGL_FEATURE_TEXTURE_NPOT_REPEAT = (1 << 17), COGL_FEATURE_TEXTURE_NPOT_REPEAT = (1 << 17),
COGL_FEATURE_POINT_SPRITE = (1 << 18), COGL_FEATURE_POINT_SPRITE = (1 << 18),
COGL_FEATURE_TEXTURE_3D = (1 << 19) COGL_FEATURE_TEXTURE_3D = (1 << 19),
COGL_FEATURE_SHADERS_ARBFP = (1 << 20)
} CoglFeatureFlags; } CoglFeatureFlags;
/** /**

2
clutter/cogl/cogl/cogl.c
View File

@ -522,7 +522,7 @@ _cogl_features_available_private (CoglFeatureFlagsPrivate features)
_cogl_features_init (); _cogl_features_init ();
if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_ARBFP)) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_ARBFP))
ctx->feature_flags_private &= ~COGL_FEATURE_PRIVATE_ARB_FP; ctx->feature_flags_private &= ~COGL_FEATURE_SHADERS_ARBFP;
return (ctx->feature_flags_private & features) == features; return (ctx->feature_flags_private & features) == features;
} }

4
clutter/cogl/cogl/driver/gl/cogl-feature-functions.h
View File

@ -119,8 +119,8 @@ COGL_FEATURE_END ()
COGL_FEATURE_BEGIN (arbfp, 255, 255, COGL_FEATURE_BEGIN (arbfp, 255, 255,
"ARB\0", "ARB\0",
"fragment_program\0", "fragment_program\0",
0, COGL_FEATURE_SHADERS_ARBFP,
COGL_FEATURE_PRIVATE_ARB_FP) 0)
COGL_FEATURE_FUNCTION (void, glGenPrograms, COGL_FEATURE_FUNCTION (void, glGenPrograms,
(GLsizei n, (GLsizei n,
GLuint *programs)) GLuint *programs))