Fix EGL context detection for non-GLES2-core functions.

Fixes failure of the X Server with glamor using desktop GL on EGL, and
the associated testcase in the tree.  This was clearly just
copy-and-paste failure on my part in
b251e3ae33.
macos/v1.5.9
Eric Anholt 11 years ago
parent bb94003b78
commit 6eb075c70e
  1. 2
      src/dispatch_common.c
  2. 1
      test/Makefile.am

@ -600,7 +600,6 @@ epoxy_get_proc_address(const char *name)
return glXGetProcAddressARB((const GLubyte *)name); return glXGetProcAddressARB((const GLubyte *)name);
} else { } else {
#if PLATFORM_HAS_EGL #if PLATFORM_HAS_EGL
if (api.glx_handle && glXGetCurrentContext()) {
GLenum egl_api = epoxy_egl_get_current_gl_context_api(); GLenum egl_api = epoxy_egl_get_current_gl_context_api();
switch (egl_api) { switch (egl_api) {
@ -610,7 +609,6 @@ epoxy_get_proc_address(const char *name)
case EGL_NONE: case EGL_NONE:
break; break;
} }
}
#endif #endif
} }
errx(1, "Couldn't find current GLX or EGL context.\n"); errx(1, "Couldn't find current GLX or EGL context.\n");

@ -63,7 +63,6 @@ TESTS = \
check_BINARIES = $(EGL_AND_GLX_BIN) check_BINARIES = $(EGL_AND_GLX_BIN)
XFAIL_TESTS = \ XFAIL_TESTS = \
egl_gl \
egl_and_glx_different_pointers_egl_glx \ egl_and_glx_different_pointers_egl_glx \
$() $()

Loading…
Cancel
Save