Revert "Add an angle_link_glx that can be used for debugging"

src/angle.gyp

@@ -17,7 +17,6 @@
         'angle_enable_d3d11%': 0,
         'angle_enable_gl%': 0,
         'angle_enable_hlsl%': 0,
-        'angle_link_glx%': 0,
         'conditions':
         [
             ['OS=="win"',

src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp

@@ -108,7 +108,6 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
     mXDisplay = xDisplay;
     mXScreen = screen;
 
-#if !defined(ANGLE_LINK_GLX)
     // Some OpenGL implementations can't handle having this library
     // handle closed while there's any X window still open against
     // which a GLXWindow was ever created.
@@ -132,33 +131,25 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
         *errorString = "Could not retrieve glXGetProcAddress";
         return false;
     }
-#else
-    getProc = reinterpret_cast<PFNGETPROCPROC>(glXGetProcAddress);
-#endif
 
 #define GET_PROC_OR_ERROR(MEMBER, NAME) \
-    if (!GetProc(getProc, MEMBER, #NAME)) \
+    if (!GetProc(getProc, MEMBER, NAME)) \
     { \
-        *errorString = "Could not load GLX entry point " #NAME; \
+        *errorString = "Could not load GLX entry point " NAME; \
         return false; \
     }
-#if !defined(ANGLE_LINK_GLX)
-#define GET_FNPTR_OR_ERROR(MEMBER, NAME) GET_PROC_OR_ERROR(MEMEBER, NAME)
-#else
-#define GET_FNPTR_OR_ERROR(MEMBER, NAME) *MEMBER = NAME;
-#endif
 
     // GLX 1.0
-    GET_FNPTR_OR_ERROR(&mFnPtrs->destroyContextPtr, glXDestroyContext);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->makeCurrentPtr, glXMakeCurrent);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->swapBuffersPtr, glXSwapBuffers);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->queryExtensionPtr, glXQueryExtension);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->queryVersionPtr, glXQueryVersion);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->waitXPtr, glXWaitX);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->waitGLPtr, glXWaitGL);
+    GET_PROC_OR_ERROR(&mFnPtrs->destroyContextPtr, "glXDestroyContext");
+    GET_PROC_OR_ERROR(&mFnPtrs->makeCurrentPtr, "glXMakeCurrent");
+    GET_PROC_OR_ERROR(&mFnPtrs->swapBuffersPtr, "glXSwapBuffers");
+    GET_PROC_OR_ERROR(&mFnPtrs->queryExtensionPtr, "glXQueryExtension");
+    GET_PROC_OR_ERROR(&mFnPtrs->queryVersionPtr, "glXQueryVersion");
+    GET_PROC_OR_ERROR(&mFnPtrs->waitXPtr, "glXWaitX");
+    GET_PROC_OR_ERROR(&mFnPtrs->waitGLPtr, "glXWaitGL");
 
     // GLX 1.1
-    GET_FNPTR_OR_ERROR(&mFnPtrs->queryExtensionsStringPtr, glXQueryExtensionsString);
+    GET_PROC_OR_ERROR(&mFnPtrs->queryExtensionsStringPtr, "glXQueryExtensionsString");
 
     // Check we have a working GLX
     {
@@ -192,20 +183,20 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
     angle::SplitStringAlongWhitespace(extensions, &mExtensions);
 
     // GLX 1.3
-    GET_FNPTR_OR_ERROR(&mFnPtrs->getFBConfigsPtr, glXGetFBConfigs);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->chooseFBConfigPtr, glXChooseFBConfig);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->getFBConfigAttribPtr, glXGetFBConfigAttrib);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->getVisualFromFBConfigPtr, glXGetVisualFromFBConfig);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->createWindowPtr, glXCreateWindow);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->destroyWindowPtr, glXDestroyWindow);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->createPbufferPtr, glXCreatePbuffer);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->destroyPbufferPtr, glXDestroyPbuffer);
-    GET_FNPTR_OR_ERROR(&mFnPtrs->queryDrawablePtr, glXQueryDrawable);
+    GET_PROC_OR_ERROR(&mFnPtrs->getFBConfigsPtr, "glXGetFBConfigs");
+    GET_PROC_OR_ERROR(&mFnPtrs->chooseFBConfigPtr, "glXChooseFBConfig");
+    GET_PROC_OR_ERROR(&mFnPtrs->getFBConfigAttribPtr, "glXGetFBConfigAttrib");
+    GET_PROC_OR_ERROR(&mFnPtrs->getVisualFromFBConfigPtr, "glXGetVisualFromFBConfig");
+    GET_PROC_OR_ERROR(&mFnPtrs->createWindowPtr, "glXCreateWindow");
+    GET_PROC_OR_ERROR(&mFnPtrs->destroyWindowPtr, "glXDestroyWindow");
+    GET_PROC_OR_ERROR(&mFnPtrs->createPbufferPtr, "glXCreatePbuffer");
+    GET_PROC_OR_ERROR(&mFnPtrs->destroyPbufferPtr, "glXDestroyPbuffer");
+    GET_PROC_OR_ERROR(&mFnPtrs->queryDrawablePtr, "glXQueryDrawable");
 
     // Extensions
     if (hasExtension("GLX_ARB_create_context"))
     {
-        GET_PROC_OR_ERROR(&mFnPtrs->createContextAttribsARBPtr, glXCreateContextAttribsARB);
+        GET_PROC_OR_ERROR(&mFnPtrs->createContextAttribsARBPtr, "glXCreateContextAttribsARB");
     }
     else
     {
@@ -213,14 +204,13 @@ bool FunctionsGLX::initialize(Display *xDisplay, int screen, std::string *errorS
     }
     if (hasExtension("GLX_EXT_swap_control"))
     {
-        GET_PROC_OR_ERROR(&mFnPtrs->swapIntervalEXTPtr, glXSwapIntervalEXT);
+        GET_PROC_OR_ERROR(&mFnPtrs->swapIntervalEXTPtr, "glXSwapIntervalEXT");
     }
     else
     {
         mFnPtrs->swapIntervalEXTPtr = nullptr;
     }
 
-#undef GET_FNPTR_OR_ERROR
 #undef GET_PROC_OR_ERROR
 
     *errorString = "";

src/libGLESv2.gypi

@@ -729,20 +729,6 @@
                 {
                     'msvs_enable_winphone' : '1',
                 }],
-                ['angle_link_glx==1',
-                {
-                    'link_settings':
-                    {
-                        'libraries':
-                        [
-                            '-lGL',
-                        ],
-                    },
-                    'defines':
-                    [
-                        'ANGLE_LINK_GLX',
-                    ],
-                }],
             ],
         },
         {