1 files changed, 0 insertions, 41 deletions
diff --git a/wxGLContext_ctor_x11Direct20160316.patch b/wxGLContext_ctor_x11Direct20160316.patch
deleted file mode 100644
index 83f6283c383b..000000000000
--- a/wxGLContext_ctor_x11Direct20160316.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git src/unix/glx11.cpp src/unix/glx11.cpp
-index 6534601..90bfc93 100644
---- src/unix/glx11.cpp
-+++ src/unix/glx11.cpp
-@@ -486,18 +486,17 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
- 
-     // We need to create a temporary context to get the
-     // glXCreateContextAttribsARB function
--    GLXContext tempContext = glXCreateContext(dpy, vi, NULL,
--                                              win->GetGLCTXAttrs().x11Direct );
-+    GLXContext tempContext = glXCreateContext(dpy, vi, NULL, x11Direct);
-     wxCHECK_RET(tempContext, "glXCreateContext failed" );
- 
--    PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB
-+    PFNGLXCREATECONTEXTATTRIBSARBPROC wx_glXCreateContextAttribsARB
-         = (PFNGLXCREATECONTEXTATTRIBSARBPROC)
-         glXGetProcAddress((GLubyte *)"glXCreateContextAttribsARB");
- 
-     glXDestroyContext( dpy, tempContext );
- 
-     // The preferred way is using glXCreateContextAttribsARB, even for old context
--    if ( !glXCreateContextAttribsARB && needsARB ) // OpenGL 3 context creation
-+    if ( !wx_glXCreateContextAttribsARB && needsARB ) // OpenGL 3 context creation
-     {
-         wxLogMessage(_("OpenGL 3.0 or later is not supported by the OpenGL driver."));
-         return;
-@@ -508,12 +507,12 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
-     g_ctxErrorOccurred = false;
-     int (*oldHandler)(Display*, XErrorEvent*) = XSetErrorHandler(&CTXErrorHandler);
- 
--    if ( glXCreateContextAttribsARB )
-+    if ( wx_glXCreateContextAttribsARB )
-     {
-         GLXFBConfig *fbc = win->GetGLXFBConfig();
-         wxCHECK_RET( fbc, "Invalid GLXFBConfig for OpenGL" );
- 
--        m_glContext = glXCreateContextAttribsARB( dpy, fbc[0],
-+        m_glContext = wx_glXCreateContextAttribsARB( dpy, fbc[0],
-                                 other ? other->m_glContext : None,
-                                 x11Direct, contextAttribs );
-     }