Browse Source

Switch to using eglGetCurrentDisplay instead of querying for the defualt

pull/308/head
erikwijmans 7 years ago
parent
commit
dd4bd88df2
  1. 2
      src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp
  2. 2
      src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template

2
src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp vendored

@ -44,7 +44,7 @@ void flextGLInit(Magnum::GL::Context& context) {
/* EGL contexts on NVidia 390 drivers don't have correct statically /* EGL contexts on NVidia 390 drivers don't have correct statically
linked GL 1.0 and 1.1 functions (such as glGetString()) and one has linked GL 1.0 and 1.1 functions (such as glGetString()) and one has
to retrieve them explicitly using eglGetProcAddress(). */ to retrieve them explicitly using eglGetProcAddress(). */
EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY); EGLDisplay display = eglGetCurrentDisplay();
const char* vendor = eglQueryString(display, EGL_VENDOR); const char* vendor = eglQueryString(display, EGL_VENDOR);
if(std::strcmp(vendor, "NVIDIA") == 0 && !context.isDriverWorkaroundDisabled("nv-egl-incorrect-gl11-function-pointers")) { if(std::strcmp(vendor, "NVIDIA") == 0 && !context.isDriverWorkaroundDisabled("nv-egl-incorrect-gl11-function-pointers")) {

2
src/MagnumExternal/OpenGL/GL/flextGLPlatform.cpp.template vendored

@ -45,7 +45,7 @@ void flextGLInit(Magnum::GL::Context& context) {
/* EGL contexts on NVidia 390 drivers don't have correct statically /* EGL contexts on NVidia 390 drivers don't have correct statically
linked GL 1.0 and 1.1 functions (such as glGetString()) and one has linked GL 1.0 and 1.1 functions (such as glGetString()) and one has
to retrieve them explicitly using eglGetProcAddress(). */ to retrieve them explicitly using eglGetProcAddress(). */
EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY); EGLDisplay display = eglGetCurrentDisplay();
const char* vendor = eglQueryString(display, EGL_VENDOR); const char* vendor = eglQueryString(display, EGL_VENDOR);
if(std::strcmp(vendor, "NVIDIA") == 0 && !context.isDriverWorkaroundDisabled("nv-egl-incorrect-gl11-function-pointers")) { if(std::strcmp(vendor, "NVIDIA") == 0 && !context.isDriverWorkaroundDisabled("nv-egl-incorrect-gl11-function-pointers")) {
@for category,funcs in functions: @for category,funcs in functions:

Loading…
Cancel
Save