diff options
author | Neil Roberts <neil@linux.intel.com> | 2012-09-26 20:32:36 +0100 |
---|---|---|
committer | Neil Roberts <neil@linux.intel.com> | 2012-10-01 14:04:16 +0100 |
commit | 66c9db993595b3a22e63f4c201ea468bc9b88cb6 (patch) | |
tree | 598716373cdf8bdb05f9e1f402ac51a885294076 /cogl/cogl-clutter.c | |
parent | 2006ddd68ea6a5d53b5a810d8dbf39025d9ec04c (diff) | |
download | cogl-66c9db993595b3a22e63f4c201ea468bc9b88cb6.tar.gz |
Add a GL 3 driver
This adds a new CoglDriver for GL 3 called COGL_DRIVER_GL3. When
requested, the GLX, EGL and SDL2 winsyss will set the necessary
attributes to request a forward-compatible core profile 3.1 context.
That means it will have no deprecated features.
To simplify the explosion of checks for specific combinations of
context->driver, many of these conditionals have now been replaced
with private feature flags that are checked instead. The GL and GLES
drivers now initialise these private feature flags depending on which
driver is used.
The fixed function backends now explicitly check whether the fixed
function private feature is available which means the GL3 driver will
fall back to always using the GLSL progend. Since Rob's latest patches
the GLSL progend no longer uses any fixed function API anyway so it
should just work.
The driver is currently lower priority than COGL_DRIVER_GL so it will
not be used unless it is specificly requested. We may want to change
this priority at some point because apparently Mesa can make some
memory savings if a core profile context is used.
In GL 3, getting the combined extensions string with glGetString is
deprecated so this patch changes it to use glGetStringi to build up an
array of extensions instead. _cogl_context_get_gl_extensions now
returns this array instead of trying to return a const string. The
caller is expected to free the array.
Some issues with this patch:
• GL 3 does not support GL_ALPHA format textures. We should probably
make this a feature flag or something. Cogl uses this to render text
which currently just throws a GL error and breaks so it's pretty
important to do something about this before considering the GL3
driver to be stable.
• GL 3 doesn't support client side vertex buffers. This probably
doesn't matter because CoglBuffer won't normally use malloc'd
buffers if VBOs are available, but it might but worth making
malloc'd buffers a private feature and forcing it not to use them.
• GL 3 doesn't support the default vertex array object. This patch
just makes it create and bind a single non-default vertex array
object which gets used just like the normal default object. Ideally
it would be good to use vertex array objects properly and attach
them to a CoglPrimitive to cache the state.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-clutter.c')
-rw-r--r-- | cogl/cogl-clutter.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/cogl/cogl-clutter.c b/cogl/cogl-clutter.c index fddff09b..b00e5101 100644 --- a/cogl/cogl-clutter.c +++ b/cogl/cogl-clutter.c @@ -29,6 +29,7 @@ #endif #include <glib.h> +#include <string.h> #include "cogl-util.h" #include "cogl-types.h" @@ -46,7 +47,26 @@ CoglBool cogl_clutter_check_extension (const char *name, const char *ext) { - return _cogl_check_extension (name, ext); + char *end; + int name_len, n; + + if (name == NULL || ext == NULL) + return FALSE; + + end = (char*)(ext + strlen(ext)); + + name_len = strlen(name); + + while (ext < end) + { + n = strcspn(ext, " "); + + if ((name_len == n) && (!strncmp(name, ext, n))) + return TRUE; + ext += (n + 1); + } + + return FALSE; } CoglBool |