diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-04-21 01:19:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 01:19:29 +0100 |
| commit | a1918874061fcea5da1739cffad55e4c3ae283c6 (patch) | |
| tree | 028111c806a8de1d1da05049db51ce93b6baa49e | |
| parent | 4e26d4dcfa94175183478fe2144b0112048a35cd (diff) | |
| parent | 1e0b063dbd8b9f5f0ba950a6b3946f05dff92e97 (diff) | |
| download | libepoxy-a1918874061fcea5da1739cffad55e4c3ae283c6.tar.gz | |
Merge pull request #223 from anholt/glsles
Fix return value of shading language for GLES2.
| -rw-r--r-- | src/dispatch_common.c | 15 | ||||
| -rw-r--r-- | test/gl_version.c | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/dispatch_common.c b/src/dispatch_common.c index b3e4f5f..9977a02 100644 --- a/src/dispatch_common.c +++ b/src/dispatch_common.c @@ -392,10 +392,10 @@ epoxy_is_desktop_gl(void) } static int -epoxy_internal_gl_version(GLenum version_string, int error_version) +epoxy_internal_gl_version(GLenum version_string, int error_version, int factor) { const char *version = (const char *)glGetString(version_string); - GLint major, minor, factor; + GLint major, minor; int scanf_count; if (!version) @@ -413,11 +413,6 @@ epoxy_internal_gl_version(GLenum version_string, int error_version) abort(); } - if (minor >= 10) - factor = 100; - else - factor = 10; - return factor * major + minor; } @@ -439,7 +434,7 @@ epoxy_internal_gl_version(GLenum version_string, int error_version) int epoxy_gl_version(void) { - return epoxy_internal_gl_version(GL_VERSION, 0); + return epoxy_internal_gl_version(GL_VERSION, 0, 10); } int @@ -448,7 +443,7 @@ epoxy_conservative_gl_version(void) if (api.begin_count) return 100; - return epoxy_internal_gl_version(GL_VERSION, 100); + return epoxy_internal_gl_version(GL_VERSION, 100, 10); } /** @@ -471,7 +466,7 @@ epoxy_glsl_version(void) { if (epoxy_gl_version() >= 20 || epoxy_has_gl_extension ("GL_ARB_shading_language_100")) - return epoxy_internal_gl_version(GL_SHADING_LANGUAGE_VERSION, 0); + return epoxy_internal_gl_version(GL_SHADING_LANGUAGE_VERSION, 0, 100); return 0; } diff --git a/test/gl_version.c b/test/gl_version.c index 9fe1bba..8873ef7 100644 --- a/test/gl_version.c +++ b/test/gl_version.c @@ -80,6 +80,8 @@ main(int argc, char **argv) pass = pass && test_version("3.0 Mesa 13.0.6", 30, "1.30", 130); + pass = pass && test_version("OpenGL ES 2.0 Mesa 20.1.0-devel (git-4bb19a330e)", 20, + "OpenGL ES GLSL ES 1.0.16", 100); pass = pass && test_version("OpenGL ES 3.2 Mesa 18.3.0-devel", 32, "OpenGL ES GLSL ES 3.20", 320); pass = pass && test_version("4.5.0 NVIDIA 384.130", 45, |