Merge pull request #194 from centricular/meson-trivial-fix
meson: Don't build glx tests if x11 is disabled
diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py
index 28dad2b..f4d0f31 100755
--- a/src/gen_dispatch.py
+++ b/src/gen_dispatch.py
@@ -50,6 +50,7 @@
self.enum = self.enum.replace(' ', '_')
self.enum = self.enum.replace('\\"', '')
self.enum = self.enum.replace('.', '_')
+ self.enum = "PROVIDER_" + self.enum
class GLFunction(object):
def __init__(self, ret_type, name):
@@ -383,6 +384,7 @@
for extension in reg.findall('extensions/extension'):
extname = extension.get('name')
+ cond_extname = "enum_string[enum_string_offsets[i]]"
self.supported_extensions.add(extname)
@@ -390,25 +392,21 @@
# or glx, which are separated by '|'
apis = extension.get('supported').split('|')
if 'glx' in apis:
- human_name = 'GLX extension \\"{0}\\"'.format(extname)
- condition = 'epoxy_conservative_has_glx_extension("{0}")'.format(extname)
+ condition = 'epoxy_conservative_has_glx_extension(provider_name)'
loader = 'glXGetProcAddress((const GLubyte *){0})'
- self.process_require_statements(extension, condition, loader, human_name)
+ self.process_require_statements(extension, condition, loader, extname)
if 'egl' in apis:
- human_name = 'EGL extension \\"{0}\\"'.format(extname)
- condition = 'epoxy_conservative_has_egl_extension("{0}")'.format(extname)
+ condition = 'epoxy_conservative_has_egl_extension(provider_name)'
loader = 'eglGetProcAddress({0})'
- self.process_require_statements(extension, condition, loader, human_name)
+ self.process_require_statements(extension, condition, loader, extname)
if 'wgl' in apis:
- human_name = 'WGL extension \\"{0}\\"'.format(extname)
- condition = 'epoxy_conservative_has_wgl_extension("{0}")'.format(extname)
+ condition = 'epoxy_conservative_has_wgl_extension(provider_name)'
loader = 'wglGetProcAddress({0})'
- self.process_require_statements(extension, condition, loader, human_name)
+ self.process_require_statements(extension, condition, loader, extname)
if {'gl', 'gles1', 'gles2'}.intersection(apis):
- human_name = 'GL extension \\"{0}\\"'.format(extname)
- condition = 'epoxy_conservative_has_gl_extension("{0}")'.format(extname)
+ condition = 'epoxy_conservative_has_gl_extension(provider_name)'
loader = 'epoxy_get_proc_address({0})'
- self.process_require_statements(extension, condition, loader, human_name)
+ self.process_require_statements(extension, condition, loader, extname)
def fixup_bootstrap_function(self, name, loader):
# We handle glGetString(), glGetIntegerv(), and
@@ -676,7 +674,7 @@
self.outln(' -1, /* {0}_provider_terminator, unused */'.format(self.target))
for human_name in sorted_providers:
enum = self.provider_enum[human_name]
- self.outln(' {1}, /* {0} */'.format(enum, self.enum_string_offset[human_name]))
+ self.outln(' {1}, /* {0} */'.format(human_name, self.enum_string_offset[human_name]))
self.outln('};')
self.outln('')
@@ -703,7 +701,9 @@
self.outln(' int i;')
self.outln(' for (i = 0; providers[i] != {0}_provider_terminator; i++) {{'.format(self.target))
+ self.outln(' const char *provider_name = enum_string + enum_string_offsets[providers[i]];')
self.outln(' switch (providers[i]) {')
+ self.outln('')
for human_name in sorted(self.provider_enum.keys()):
enum = self.provider_enum[human_name]
diff --git a/test/Makefile.am b/test/Makefile.am
index b081786..fc3ffcd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -57,6 +57,7 @@
$(GLX_TESTS) \
$(EGL_AND_GLX_TESTS) \
$(WGL_TESTS) \
+ gl_version$(EXEEXT) \
headerguards$(EXEEXT) \
miscdefines$(EXEEXT) \
khronos_typedefs$(EXEEXT) \
diff --git a/test/egl_epoxy_api.c b/test/egl_epoxy_api.c
index a840525..252b535 100644
--- a/test/egl_epoxy_api.c
+++ b/test/egl_epoxy_api.c
@@ -27,7 +27,11 @@
* Tests the Epoxy API using EGL.
*/
+#ifdef __sun
+#define __EXTENSIONS__
+#else
#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/test/egl_has_extension_nocontext.c b/test/egl_has_extension_nocontext.c
index a95860a..4fa5f60 100644
--- a/test/egl_has_extension_nocontext.c
+++ b/test/egl_has_extension_nocontext.c
@@ -28,7 +28,11 @@
* no context bound would fail out in dispatch.
*/
+#ifdef __sun
+#define __EXTENSIONS__
+#else
#define _GNU_SOURCE
+#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/test/gl_version.c b/test/gl_version.c
new file mode 100644
index 0000000..9ab0080
--- /dev/null
+++ b/test/gl_version.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2018 Broadcom
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include "epoxy/gl.h"
+
+GLenum mock_enum;
+const char *mock_gl_version;
+const char *mock_glsl_version;
+
+static const GLubyte *override_glGetString(GLenum name)
+{
+ switch (name) {
+ case GL_VERSION:
+ return (GLubyte *)mock_gl_version;
+ case GL_SHADING_LANGUAGE_VERSION:
+ return (GLubyte *)mock_glsl_version;
+ default:
+ assert(!"unexpected glGetString() enum");
+ return 0;
+ }
+}
+
+static bool
+test_version(const char *gl_string, int gl_version,
+ const char *glsl_string, int glsl_version)
+{
+ int epoxy_version;
+
+ mock_gl_version = gl_string;
+ mock_glsl_version = glsl_string;
+
+ epoxy_version = epoxy_gl_version();
+ if (epoxy_version != gl_version) {
+ fprintf(stderr,
+ "glGetString(GL_VERSION) = \"%s\" returned epoxy_gl_version() "
+ "%d instead of %d\n", gl_string, epoxy_version, gl_version);
+ return false;
+ }
+
+
+ epoxy_version = epoxy_glsl_version();
+ if (epoxy_version != glsl_version) {
+ fprintf(stderr,
+ "glGetString() = \"%s\" returned epoxy_glsl_version() "
+ "%d instead of %d\n", glsl_string, epoxy_version, glsl_version);
+ return false;
+ }
+
+ return true;
+}
+
+int
+main(int argc, char **argv)
+{
+ bool pass = true;
+
+ epoxy_glGetString = override_glGetString;
+
+ pass = pass && test_version("3.0 Mesa 13.0.6", 30,
+ "1.30", 130);
+ 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,
+ "4.50", 450);
+
+ return pass != true;
+}
diff --git a/test/meson.build b/test/meson.build
index 3eda320..862d57a 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -33,6 +33,12 @@
c_args: common_cflags,
dependencies: libepoxy_dep,
include_directories: libepoxy_inc))
+test('gl_version',
+ executable('gl_version',
+ 'gl_version.c',
+ c_args: common_cflags,
+ dependencies: libepoxy_dep,
+ include_directories: libepoxy_inc))
if build_egl and build_x11_tests
egl_common_sources = [ 'egl_common.h', 'egl_common.c', ]