Remove the "EGL/GLX have different pointers" tests

The correct answer for systems with different EGL and GLX driver
implementations is to use GLVND.`

Closes #165

3 files changed, 0 insertions, 300 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 1513099..b081786 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -65,7 +65,6 @@ TESTS = \
 check_BINARIES = $(EGL_AND_GLX_BIN)
 
 XFAIL_TESTS = \
-        egl_and_glx_different_pointers_egl_glx \
 	$()
 
 check_PROGRAMS = $(TESTS)
@@ -99,9 +98,6 @@ if BUILD_GLX
 if HAVE_DLVSYM
 EGL_AND_GLX_TESTS = \
 	egl_gl \
-	egl_and_glx_different_pointers_egl_glx \
-	egl_and_glx_different_pointers_egl \
-	egl_and_glx_different_pointers_glx \
         $()
 endif
 endif
@@ -153,21 +149,6 @@ egl_gles2_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=2
 egl_gles2_without_glx_SOURCES = egl_without_glx.c
 egl_gles2_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS)
 
-egl_and_glx_different_pointers_egl_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_egl_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_egl_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_egl_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_EGL
-
-egl_and_glx_different_pointers_glx_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_glx_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_glx_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_glx_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_GLX
-
-egl_and_glx_different_pointers_egl_glx_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_egl_glx_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_egl_glx_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_egl_glx_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_EGL -DUSE_GLX
-
 glx_alias_prefer_same_name_SOURCES = glx_alias_prefer_same_name.c dlwrap.c dlwrap.h
 glx_alias_prefer_same_name_LDFLAGS = -rdynamic
 glx_alias_prefer_same_name_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) $(DLOPEN_LIBS)
diff --git a/test/egl_and_glx_different_pointers.c b/test/egl_and_glx_different_pointers.c
deleted file mode 100644
index db7a7e6..0000000
--- a/test/egl_and_glx_different_pointers.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright © 2014 Intel Corporation
- *
- * 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.
- */
-
-/**
- * @file egl_and_glx_different_pointers.c
- *
- * Tests that epoxy correctly handles an EGL and GLX implementation
- * that return different function pointers between the two.
- *
- * This is the case for EGL and GLX on nvidia binary drivers
- * currently, but is also the case if someone has nvidia binary GLX
- * installed but still has Mesa (software) EGL installed.  This seems
- * common enough that we should make sure things work.
- */
-
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <err.h>
-#include <dlfcn.h>
-#include "epoxy/gl.h"
-#include "epoxy/egl.h"
-#include "epoxy/glx.h"
-
-#include "egl_common.h"
-#include "glx_common.h"
-#include "dlwrap.h"
-
-#define GLX_FAKED_VENDOR_STRING "libepoxy override GLX"
-#define EGL_FAKED_VENDOR_STRING "libepoxy override EGL"
-
-#define GL_CREATESHADER_VALUE 1234
-#define GLES2_CREATESHADER_VALUE 5678
-
-const char *override_GLES2_glGetString(GLenum e);
-const char *override_GL_glGetString(GLenum e);
-GLuint override_GLES2_glCreateShader(GLenum e);
-GLuint override_GL_glCreateShader(GLenum e);
-
-const char *
-override_GL_glGetString(GLenum e)
-{
-    if (e == GL_VENDOR)
-        return GLX_FAKED_VENDOR_STRING;
-
-    return DEFER_TO_GL("libGL.so.1", override_GL_glGetString,
-                       "glGetString", (e));
-}
-
-const char *
-override_GLES2_glGetString(GLenum e)
-{
-    if (e == GL_VENDOR)
-        return EGL_FAKED_VENDOR_STRING;
-
-    return DEFER_TO_GL("libGLESv2.so.2", override_GLES2_glGetString,
-                       "glGetString", (e));
-}
-
-GLuint
-override_GL_glCreateShader(GLenum type)
-{
-    return GL_CREATESHADER_VALUE;
-}
-
-GLuint
-override_GLES2_glCreateShader(GLenum type)
-{
-    return GLES2_CREATESHADER_VALUE;
-}
-
-#ifdef USE_GLX
-static bool
-make_glx_current_and_test(Display *dpy, GLXContext ctx, Drawable draw)
-{
-    const char *string;
-    GLuint shader;
-    bool pass = true;
-
-    glXMakeCurrent(dpy, draw, ctx);
-
-    if (!epoxy_is_desktop_gl()) {
-        fputs("Claimed to be ES\n", stderr);
-        pass = false;
-    }
-
-    string = (const char *)glGetString(GL_VENDOR);
-    printf("GLX vendor: %s\n", string);
-
-    shader = glCreateShader(GL_FRAGMENT_SHADER);
-    if (shader != GL_CREATESHADER_VALUE) {
-        fprintf(stderr, "glCreateShader() returned %d instead of %d\n",
-                shader, GL_CREATESHADER_VALUE);
-        pass = false;
-    }
-
-    pass = pass && !strcmp(string, GLX_FAKED_VENDOR_STRING);
-
-    return pass;
-}
-
-static void
-init_glx(Display **out_dpy, GLXContext *out_ctx, Drawable *out_draw)
-{
-    Display *dpy = get_display_or_skip();
-    make_glx_context_current_or_skip(dpy);
-
-    *out_dpy = dpy;
-    *out_ctx = glXGetCurrentContext();
-    *out_draw= glXGetCurrentDrawable();
-}
-#endif /* USE_GLX */
-
-#ifdef USE_EGL
-static bool
-make_egl_current_and_test(EGLDisplay *dpy, EGLContext ctx)
-{
-    const char *string;
-    GLuint shader;
-    bool pass = true;
-
-    eglMakeCurrent(dpy, NULL, NULL, ctx);
-
-    if (epoxy_is_desktop_gl()) {
-        fputs("Claimed to be desktop\n", stderr);
-        pass = false;
-    }
-
-    if (epoxy_gl_version() < 20) {
-        fprintf(stderr, "Claimed to be GL version %d\n",
-                epoxy_gl_version());
-        pass = false;
-    }
-
-    shader = glCreateShader(GL_FRAGMENT_SHADER);
-    if (shader != GLES2_CREATESHADER_VALUE) {
-        fprintf(stderr, "glCreateShader() returned %d instead of %d\n",
-                shader, GLES2_CREATESHADER_VALUE);
-        pass = false;
-    }
-
-    string = (const char *)glGetString(GL_VENDOR);
-    printf("EGL vendor: %s\n", string);
-
-    pass = pass && !strcmp(string, EGL_FAKED_VENDOR_STRING);
-
-    return pass;
-}
-
-static void
-init_egl(EGLDisplay **out_dpy, EGLContext *out_ctx)
-{
-    EGLDisplay *dpy = get_egl_display_or_skip();
-    static const EGLint config_attribs[] = {
-	EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	EGL_RED_SIZE, 1,
-	EGL_GREEN_SIZE, 1,
-	EGL_BLUE_SIZE, 1,
-	EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
-	EGL_NONE
-    };
-    static const EGLint context_attribs[] = {
-        EGL_CONTEXT_CLIENT_VERSION, 2,
-        EGL_NONE
-    };
-    EGLContext ctx;
-    EGLConfig cfg;
-    EGLint count;
-
-    if (!epoxy_has_egl_extension(dpy, "EGL_KHR_surfaceless_context"))
-        errx(77, "Test requires EGL_KHR_surfaceless_context");
-
-    eglBindAPI(EGL_OPENGL_ES_API);
-
-    if (!eglChooseConfig(dpy, config_attribs, &cfg, 1, &count))
-        errx(77, "Couldn't get an EGLConfig\n");
-
-    ctx = eglCreateContext(dpy, cfg, NULL, context_attribs);
-    if (!ctx)
-        errx(77, "Couldn't create a GLES2 context\n");
-
-    *out_dpy = dpy;
-    *out_ctx = ctx;
-}
-#endif /* USE_EGL */
-
-int
-main(int argc, char **argv)
-{
-    bool pass = true;
-#ifdef USE_EGL
-    EGLDisplay *egl_dpy;
-    EGLContext egl_ctx;
-#endif
-#ifdef USE_GLX
-    Display *glx_dpy;
-    GLXContext glx_ctx;
-    Drawable glx_draw;
-#endif
-
-    /* Force epoxy to have loaded both EGL and GLX libs already -- we
-     * can't assume anything about symbol resolution based on having
-     * EGL or GLX loaded.
-     */
-    (void)glXGetCurrentContext();
-    (void)eglGetCurrentContext();
-
-#ifdef USE_GLX
-    init_glx(&glx_dpy, &glx_ctx, &glx_draw);
-    pass = make_glx_current_and_test(glx_dpy, glx_ctx, glx_draw) && pass;
-#endif
-#ifdef USE_EGL
-    init_egl(&egl_dpy, &egl_ctx);
-    pass = make_egl_current_and_test(egl_dpy, egl_ctx) && pass;
-#endif
-
-#if defined(USE_GLX) && defined(USE_EGL)
-    pass = make_glx_current_and_test(glx_dpy, glx_ctx, glx_draw) && pass;
-    pass = make_egl_current_and_test(egl_dpy, egl_ctx) && pass;
-#endif
-
-    return pass != true;
-}
diff --git a/test/meson.build b/test/meson.build
index 62f2f3d..ee1a732 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -116,41 +116,6 @@ if build_glx
       test(test_name, test_bin)
     endif
   endforeach
-
-  if has_dlvsym
-    # GLX/EGL tests
-    if build_egl
-      glx_egl_sources = [
-        'egl_and_glx_different_pointers.c',
-        'dlwrap.c',
-        'dlwrap.h',
-      ]
-
-      glx_egl_deps = [ libepoxy_dep, x11_dep, dl_dep ]
-      glx_egl_link_flags = [ '-rdynamic' ]
-      glx_egl_link_with = [ glx_common_lib, egl_common_lib ]
-
-      glx_egl_tests = [
-        [ 'egl_and_glx_different_pointers_glx', [ '-DUSE_GLX' ], false ],
-        [ 'egl_and_glx_different_pointers_egl', [ '-DUSE_EGL' ], false ],
-        [ 'egl_and_glx_different_pointers_egl_glx', [ '-DUSE_EGL', '-DUSE_GLX' ], true ],
-      ]
-
-      foreach test: glx_egl_tests
-        test_name = test[0]
-        test_c_args = test[1]
-        test_should_fail = test[2]
-
-        test_bin = executable(test_name, glx_egl_sources,
-                              c_args: common_cflags + test_c_args,
-                              include_directories: libepoxy_inc,
-                              dependencies: glx_egl_deps,
-                              link_with: glx_egl_link_with,
-                              link_args: glx_egl_link_flags)
-        test(test_name, test_bin, should_fail: test_should_fail)
-      endforeach
-    endif
-  endif
 endif
 
 # WGL