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

Move all of the GL function pointers directly to CoglContext

Browse Source 
Instead of storing all of the feature function pointers in the driver
specific data of the CoglContext they are now all stored directly in
CoglContext. There is a single header containing the description of
the functions which gets included by cogl-context.h. There is a single
function in cogl-feature-private.c to check for all of these
functions.

The name of the function pointer variables have been changed from
ctx->drv.pf_glWhatever to just ctx->glWhatever.

The feature flags that get set when an extension is available are now
separated from the table of extensions. This is necessary because
different extensions can mean different things on GLES and GL. For
example, having access to glMapBuffer implies read and write support
on GL but only write support on GLES. The flags are instead set in the
driver specific init function by checking whether the function
pointers were successfully resolved.

_cogl_feature_check has been changed to assume the feature is
supported if any of the listed extensions are available instead of
requiring all of them. This makes it more convenient to specify
alternate names for the extension. Nothing else had previously listed
more than one name for an extension so this shouldn't cause any
problems.
This commit is contained in:
Neil Roberts
2011-07-06 18:59:20 +01:00
parent 17a558a386
commit dae02a99a5
30 changed files with 749 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cogl/cogl-feature-private.h
View File

@ -33,6 +33,12 @@
((driver_major) > (target_major) || \
((driver_major) == (target_major) && (driver_minor) >= (target_minor)))
typedef enum
{
COGL_EXT_IN_GLES = (1 << 0),
COGL_EXT_IN_GLES2 = (1 << 1)
} CoglExtGlesAvailability;
typedef struct _CoglFeatureFunction CoglFeatureFunction;
struct _CoglFeatureFunction
@ -50,11 +56,14 @@ struct _CoglFeatureData
/* A minimum GL version which the functions should be defined in
without needing an extension. Set to 255,255 if it's only
provided in an extension */
guint8 min_gl_major, min_gl_minor;
int min_gl_major, min_gl_minor;
/* Flags specifying which versions of GLES the feature is available
in core in */
CoglExtGlesAvailability gles_availability;
/* \0 separated list of namespaces to try. Eg "EXT\0ARB\0" */
const char *namespaces;
/* \0 separated list of required extension names without the GL_EXT
or GL_ARB prefix. All of the extensions must be available for the
or GL_ARB prefix. Any of the extensions must be available for the
feature to be considered available. If the suffix for an
extension is different from the namespace, you can specify it
with a ':' after the namespace */
@ -75,9 +84,17 @@ gboolean
_cogl_feature_check (const CoglWinsysVtable *winsys,
const char *driver_prefix,
const CoglFeatureData *data,
unsigned int gl_major,
unsigned int gl_minor,
int gl_major,
int gl_minor,
CoglExtGlesAvailability gles_version,
const char *extensions_string,
void *function_table);
void
_cogl_feature_check_ext_functions (CoglContext *context,
int gl_major,
int gl_minor,
const char *gl_extensions,
CoglExtGlesAvailability gles_version);
#endif /* __COGL_FEATURE_PRIVATE_H */