diff options
| author | Eric Anholt <eric@anholt.net> | 2014-01-22 00:57:35 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-01-22 01:06:04 -0800 |
| commit | aa778ef39db0d051d0faa3a67553d7bd6cad08dd (patch) | |
| tree | 73eac9f63b294b80851a4228b1be435990fef58c | |
| parent | 7f68641d1b3bc1b3336d846f4ecf7620cde22f82 (diff) | |
Add support for Mesa's GLES1 implementation.
Mesa reports "OpenGL ES-CM 1.1", so we need to not look for a space
after "ES", and 1.1 is still a 1.0-compatible implementation.
| -rw-r--r-- | src/dispatch_common.c | 2 | ||||
| -rwxr-xr-x | src/gen_dispatch.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dispatch_common.c b/src/dispatch_common.c index 8c04526..38a5f67 100644 --- a/src/dispatch_common.c +++ b/src/dispatch_common.c @@ -218,7 +218,7 @@ do_dlsym(void **handle, const char *lib_name, const char *name, PUBLIC bool epoxy_is_desktop_gl(void) { - const char *es_prefix = "OpenGL ES "; + const char *es_prefix = "OpenGL ES"; const char *version; if (api.begin_count) diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py index 9b53fc2..637fd8f 100755 --- a/src/gen_dispatch.py +++ b/src/gen_dispatch.py @@ -347,7 +347,7 @@ class Generator(object): loader = 'epoxy_get_proc_address({0})' elif api == 'gles1': human_name = 'OpenGL ES 1.0' - condition = '!epoxy_is_desktop_gl() && epoxy_gl_version() == 10' + condition = '!epoxy_is_desktop_gl() && epoxy_gl_version() >= 10 && epoxy_gl_version() < 20' loader = 'epoxy_gles1_dlsym({0})' elif api == 'glx': human_name = 'GLX {0}'.format(version) |