Remove GL/EGL function pointers from tests.

src/tests/egl_tests/EGLPresentPathD3D11Test.cpp

@@ -88,23 +88,13 @@ class EGLPresentPathD3D11 : public ANGLETest
         EGLAttrib device      = 0;
         EGLAttrib angleDevice = 0;
 
-        PFNEGLQUERYDISPLAYATTRIBEXTPROC queryDisplayAttribEXT;
-        PFNEGLQUERYDEVICEATTRIBEXTPROC queryDeviceAttribEXT;
-
         const char *extensionString =
             static_cast<const char *>(eglQueryString(mDisplay, EGL_EXTENSIONS));
         EXPECT_TRUE(strstr(extensionString, "EGL_EXT_device_query"));
 
-        queryDisplayAttribEXT =
-            (PFNEGLQUERYDISPLAYATTRIBEXTPROC)eglGetProcAddress("eglQueryDisplayAttribEXT");
-        queryDeviceAttribEXT =
-            (PFNEGLQUERYDEVICEATTRIBEXTPROC)eglGetProcAddress("eglQueryDeviceAttribEXT");
-        ASSERT_NE(nullptr, queryDisplayAttribEXT);
-        ASSERT_NE(nullptr, queryDeviceAttribEXT);
-
-        ASSERT_EGL_TRUE(queryDisplayAttribEXT(mDisplay, EGL_DEVICE_EXT, &angleDevice));
-        ASSERT_EGL_TRUE(queryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
-                                             EGL_D3D11_DEVICE_ANGLE, &device));
+        ASSERT_EGL_TRUE(eglQueryDisplayAttribEXT(mDisplay, EGL_DEVICE_EXT, &angleDevice));
+        ASSERT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
+                                                EGL_D3D11_DEVICE_ANGLE, &device));
         ID3D11Device *d3d11Device = reinterpret_cast<ID3D11Device *>(device);
 
         D3D11_TEXTURE2D_DESC textureDesc = {0};

src/tests/egl_tests/EGLSurfaceTest.cpp

@@ -91,11 +91,6 @@ class EGLSurfaceTest : public ANGLETest
 
     void initializeDisplay()
     {
-        PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT =
-            reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(
-                eglGetProcAddress("eglGetPlatformDisplayEXT"));
-        ASSERT_TRUE(eglGetPlatformDisplayEXT != nullptr);
-
         GLenum platformType = GetParam().getRenderer();
 
         std::vector<EGLint> displayAttributes;

src/tests/egl_tests/EGLSyncControlTest.cpp

@@ -15,12 +15,6 @@
 
 using namespace angle;
 
-typedef EGLBoolean(EGLAPIENTRYP PFNEGLGETSYNCVALUESCHROMIUMPROC)(EGLDisplay dpy,
-                                                                 EGLSurface surface,
-                                                                 EGLuint64KHR *ust,
-                                                                 EGLuint64KHR *msc,
-                                                                 EGLuint64KHR *sbc);
-
 class EGLSyncControlTest : public testing::Test
 {
   protected:
@@ -54,9 +48,6 @@ class EGLSyncControlTest : public testing::Test
                 mDeviceCreationD3D11ExtAvailable = true;
             }
         }
-
-        eglGetSyncValuesCHROMIUM = reinterpret_cast<PFNEGLGETSYNCVALUESCHROMIUMPROC>(
-            eglGetProcAddress("eglGetSyncValuesCHROMIUM"));
     }
 
     void TearDown() override
@@ -173,11 +164,10 @@ class EGLSyncControlTest : public testing::Test
 
     OSWindow *mOSWindow = nullptr;
 
-    EGLDisplay mDisplay                                      = EGL_NO_DISPLAY;
-    EGLSurface mSurface                                      = EGL_NO_SURFACE;
-    EGLContext mContext                                      = EGL_NO_CONTEXT;
-    EGLConfig mConfig                                        = 0;
-    PFNEGLGETSYNCVALUESCHROMIUMPROC eglGetSyncValuesCHROMIUM = nullptr;
+    EGLDisplay mDisplay = EGL_NO_DISPLAY;
+    EGLSurface mSurface = EGL_NO_SURFACE;
+    EGLContext mContext = EGL_NO_CONTEXT;
+    EGLConfig mConfig   = 0;
 };
 
 // Basic test for eglGetSyncValuesCHROMIUM extension. Verifies that eglGetSyncValuesCHROMIUM

src/tests/gl_tests/CopyCompressedTextureTest.cpp

@@ -48,13 +48,6 @@ class CopyCompressedTextureTest : public ANGLETest
 
         mProgram = CompileProgram(kVS, kFS);
         ASSERT_NE(0u, mProgram);
-
-        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_compressed_texture"))
-        {
-            glCompressedCopyTextureCHROMIUM =
-                reinterpret_cast<PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC>(
-                    eglGetProcAddress("glCompressedCopyTextureCHROMIUM"));
-        }
     }
 
     void testTearDown() override
@@ -84,8 +77,6 @@ class CopyCompressedTextureTest : public ANGLETest
 
     GLuint mProgram     = 0;
     GLuint mTextures[2] = {0, 0};
-
-    PFNGLCOMPRESSEDCOPYTEXTURECHROMIUMPROC glCompressedCopyTextureCHROMIUM = nullptr;
 };
 
 namespace

src/tests/gl_tests/CopyTextureTest.cpp

@@ -40,14 +40,6 @@ class CopyTextureTest : public ANGLETest
         glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[1],
                                0);
-
-        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
-        {
-            glCopyTextureCHROMIUM = reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(
-                eglGetProcAddress("glCopyTextureCHROMIUM"));
-            glCopySubTextureCHROMIUM = reinterpret_cast<PFNGLCOPYSUBTEXTURECHROMIUMPROC>(
-                eglGetProcAddress("glCopySubTextureCHROMIUM"));
-        }
     }
 
     void testTearDown() override
@@ -120,9 +112,6 @@ class CopyTextureTest : public ANGLETest
         0,
     };
     GLuint mFramebuffer = 0;
-
-    PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM       = nullptr;
-    PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM = nullptr;
 };
 
 using CopyTextureVariationsTestParams =
@@ -220,14 +209,6 @@ class CopyTextureVariationsTest : public ANGLETestWithParam<CopyTextureVariation
         glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
         glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTextures[1],
                                0);
-
-        if (IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"))
-        {
-            glCopyTextureCHROMIUM = reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(
-                eglGetProcAddress("glCopyTextureCHROMIUM"));
-            glCopySubTextureCHROMIUM = reinterpret_cast<PFNGLCOPYSUBTEXTURECHROMIUMPROC>(
-                eglGetProcAddress("glCopySubTextureCHROMIUM"));
-        }
     }
 
     void testTearDown() override
@@ -251,8 +232,6 @@ class CopyTextureVariationsTest : public ANGLETestWithParam<CopyTextureVariation
             return false;
         }
 
-        EXPECT_NE(nullptr, glCopyTextureCHROMIUM);
-        EXPECT_NE(nullptr, glCopySubTextureCHROMIUM);
         return true;
     }
 
@@ -543,9 +522,6 @@ class CopyTextureVariationsTest : public ANGLETestWithParam<CopyTextureVariation
         0,
     };
     GLuint mFramebuffer = 0;
-
-    PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM       = nullptr;
-    PFNGLCOPYSUBTEXTURECHROMIUMPROC glCopySubTextureCHROMIUM = nullptr;
 };
 
 class CopyTextureTestDest : public CopyTextureTest
@@ -1671,12 +1647,11 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
         EXPECT_PIXEL_COLOR_NEAR(0, 0, expectedColor, 1.0);
     };
 
-    auto testCopyCombination = [this, testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
-                                                  GLenum sourceType, const GLColor &sourceColor,
-                                                  GLenum destInternalFormat, GLenum destType,
-                                                  bool flipY, bool premultiplyAlpha,
-                                                  bool unmultiplyAlpha,
-                                                  const GLColor &expectedColor) {
+    auto testCopyCombination = [testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
+                                            GLenum sourceType, const GLColor &sourceColor,
+                                            GLenum destInternalFormat, GLenum destType, bool flipY,
+                                            bool premultiplyAlpha, bool unmultiplyAlpha,
+                                            const GLColor &expectedColor) {
         GLTexture sourceTexture;
         glBindTexture(GL_TEXTURE_2D, sourceTexture);
         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
@@ -1692,12 +1667,11 @@ TEST_P(CopyTextureTestES3, ES3UnormFormats)
         testOutput(destTexture, expectedColor);
     };
 
-    auto testSubCopyCombination = [this, testOutput](
-                                      GLenum sourceInternalFormat, GLenum sourceFormat,
-                                      GLenum sourceType, const GLColor &sourceColor,
-                                      GLenum destInternalFormat, GLenum destFormat, GLenum destType,
-                                      bool flipY, bool premultiplyAlpha, bool unmultiplyAlpha,
-                                      const GLColor &expectedColor) {
+    auto testSubCopyCombination = [testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
+                                               GLenum sourceType, const GLColor &sourceColor,
+                                               GLenum destInternalFormat, GLenum destFormat,
+                                               GLenum destType, bool flipY, bool premultiplyAlpha,
+                                               bool unmultiplyAlpha, const GLColor &expectedColor) {
         GLTexture sourceTexture;
         glBindTexture(GL_TEXTURE_2D, sourceTexture);
         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
@@ -1810,12 +1784,11 @@ TEST_P(CopyTextureTestES3, ES3FloatFormats)
         EXPECT_PIXEL_COLOR32F_NEAR(0, 0, expectedColor, 0.05);
     };
 
-    auto testCopyCombination = [this, testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
-                                                  GLenum sourceType, const GLColor &sourceColor,
-                                                  GLenum destInternalFormat, GLenum destType,
-                                                  bool flipY, bool premultiplyAlpha,
-                                                  bool unmultiplyAlpha,
-                                                  const GLColor32F &expectedColor) {
+    auto testCopyCombination = [testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
+                                            GLenum sourceType, const GLColor &sourceColor,
+                                            GLenum destInternalFormat, GLenum destType, bool flipY,
+                                            bool premultiplyAlpha, bool unmultiplyAlpha,
+                                            const GLColor32F &expectedColor) {
         GLTexture sourceTexture;
         glBindTexture(GL_TEXTURE_2D, sourceTexture);
         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,
@@ -1941,12 +1914,11 @@ TEST_P(CopyTextureTestES3, ES3UintFormats)
         EXPECT_NEAR(std::get<3>(expectedColor), pixel[3], 1);
     };
 
-    auto testCopyCombination = [this, testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
-                                                  GLenum sourceType, const GLColor &sourceColor,
-                                                  GLenum destInternalFormat, GLenum destType,
-                                                  bool flipY, bool premultiplyAlpha,
-                                                  bool unmultiplyAlpha,
-                                                  const GLColor32U &expectedColor) {
+    auto testCopyCombination = [testOutput](GLenum sourceInternalFormat, GLenum sourceFormat,
+                                            GLenum sourceType, const GLColor &sourceColor,
+                                            GLenum destInternalFormat, GLenum destType, bool flipY,
+                                            bool premultiplyAlpha, bool unmultiplyAlpha,
+                                            const GLColor32U &expectedColor) {
         GLTexture sourceTexture;
         glBindTexture(GL_TEXTURE_2D, sourceTexture);
         glTexImage2D(GL_TEXTURE_2D, 0, sourceInternalFormat, 1, 1, 0, sourceFormat, sourceType,

src/tests/gl_tests/ImageTest.cpp

@@ -123,11 +123,6 @@ class ImageTest : public ANGLETest
                 glGetUniformLocation(mTextureExternalESSL3Program, "tex");
         }
 
-        eglCreateImageKHR =
-            reinterpret_cast<PFNEGLCREATEIMAGEKHRPROC>(eglGetProcAddress("eglCreateImageKHR"));
-        eglDestroyImageKHR =
-            reinterpret_cast<PFNEGLDESTROYIMAGEKHRPROC>(eglGetProcAddress("eglDestroyImageKHR"));
-
         ASSERT_GL_NO_ERROR();
     }
 
@@ -467,9 +462,6 @@ class ImageTest : public ANGLETest
 
     GLuint mTextureExternalESSL3Program        = 0;
     GLint mTextureExternalESSL3UniformLocation = -1;
-
-    PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
-    PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
 };
 
 class ImageTestES3 : public ImageTest

src/tests/gl_tests/PathRenderingTest.cpp

@@ -1064,12 +1064,6 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
         }
     }
 
-    void testSetUp() override
-    {
-        mBindUniformLocation = reinterpret_cast<PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC>(
-            eglGetProcAddress("glBindUniformLocationCHROMIUM"));
-    }
-
     // Sets up the GL program state for the test.
     // Vertex shader needs at least following variables:
     //  uniform mat4 view_matrix;
@@ -1112,9 +1106,9 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
     void bindProgram()
     {
         glBindAttribLocation(mProgram, kPositionLocation, "position");
-        mBindUniformLocation(mProgram, kViewMatrixLocation, "view_matrix");
-        mBindUniformLocation(mProgram, kColorMatrixLocation, "color_matrix");
-        mBindUniformLocation(mProgram, kModelTranslateLocation, "model_translate");
+        glBindUniformLocationCHROMIUM(mProgram, kViewMatrixLocation, "view_matrix");
+        glBindUniformLocationCHROMIUM(mProgram, kColorMatrixLocation, "color_matrix");
+        glBindUniformLocationCHROMIUM(mProgram, kModelTranslateLocation, "model_translate");
         glBindFragmentInputLocationCHROMIUM(mProgram, kColorFragmentInputLocation, "color");
 
         ASSERT_GL_NO_ERROR();
@@ -1213,11 +1207,6 @@ class CHROMIUMPathRenderingWithTexturingTest : public ANGLETest
         kTestColumns = kResolution / kShapeWidth,
     };
 
-    typedef void(GL_APIENTRYP PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC)(GLuint mProgram,
-                                                                    GLint location,
-                                                                    const GLchar *name);
-    PFNGLBINDUNIFORMLOCATIONCHROMIUMPROC mBindUniformLocation = nullptr;
-
     GLuint mProgram;
 
     // This uniform be can set by the test. It should be used to set the color for

src/tests/gl_tests/RobustResourceInitTest.cpp

@@ -789,8 +789,6 @@ TEST_P(RobustResourceInitTestES3, ReadingOutOfBoundsCopiedTextureWithUnpackBuffe
     // GL_ALPHA texture can't be read with glReadPixels, for convenience this test uses
     // glCopyTextureCHROMIUM to copy GL_ALPHA into GL_RGBA
     ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_CHROMIUM_copy_texture"));
-    PFNGLCOPYTEXTURECHROMIUMPROC glCopyTextureCHROMIUM =
-        reinterpret_cast<PFNGLCOPYTEXTURECHROMIUMPROC>(eglGetProcAddress("glCopyTextureCHROMIUM"));
 
     GLFramebuffer fbo;
     glBindFramebuffer(GL_FRAMEBUFFER, fbo);

src/tests/gl_tests/WebGLCompatibilityTest.cpp

@@ -67,12 +67,6 @@ class WebGLCompatibilityTest : public ANGLETest
         setWebGLCompatibilityEnabled(true);
     }
 
-    void testSetUp() override
-    {
-        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
-            eglGetProcAddress("glRequestExtensionANGLE"));
-    }
-
     template <typename T>
     void TestFloatTextureFormat(GLenum internalFormat,
                                 GLenum format,
@@ -284,8 +278,6 @@ void main()
                                                    GLsizei blockSize,
                                                    const std::string &extName,
                                                    bool subImageAllowed);
-
-    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
 };
 
 class WebGL2CompatibilityTest : public WebGLCompatibilityTest

src/tests/test_utils/ANGLETest.cpp

@@ -1000,20 +1000,10 @@ void ANGLETestBase::checkD3D11SDKLayersMessages()
     EGLAttrib device      = 0;
     EGLAttrib angleDevice = 0;
 
-    PFNEGLQUERYDISPLAYATTRIBEXTPROC queryDisplayAttribEXT;
-    PFNEGLQUERYDEVICEATTRIBEXTPROC queryDeviceAttribEXT;
-
-    queryDisplayAttribEXT = reinterpret_cast<PFNEGLQUERYDISPLAYATTRIBEXTPROC>(
-        eglGetProcAddress("eglQueryDisplayAttribEXT"));
-    queryDeviceAttribEXT = reinterpret_cast<PFNEGLQUERYDEVICEATTRIBEXTPROC>(
-        eglGetProcAddress("eglQueryDeviceAttribEXT"));
-    ASSERT_NE(nullptr, queryDisplayAttribEXT);
-    ASSERT_NE(nullptr, queryDeviceAttribEXT);
-
     ASSERT_EGL_TRUE(
-        queryDisplayAttribEXT(mFixture->eglWindow->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
-    ASSERT_EGL_TRUE(queryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
-                                         EGL_D3D11_DEVICE_ANGLE, &device));
+        eglQueryDisplayAttribEXT(mFixture->eglWindow->getDisplay(), EGL_DEVICE_EXT, &angleDevice));
+    ASSERT_EGL_TRUE(eglQueryDeviceAttribEXT(reinterpret_cast<EGLDeviceEXT>(angleDevice),
+                                            EGL_D3D11_DEVICE_ANGLE, &device));
     ID3D11Device *d3d11Device = reinterpret_cast<ID3D11Device *>(device);
 
     ID3D11InfoQueue *infoQueue = nullptr;

src/tests/test_utils/MultiviewTest.h

@@ -97,17 +97,9 @@ class MultiviewTestBase : public ANGLETestBase
     }
     virtual ~MultiviewTestBase() {}
 
-    void MultiviewTestBaseSetUp()
-    {
-        ANGLETestBase::ANGLETestSetUp();
-
-        glRequestExtensionANGLE = reinterpret_cast<PFNGLREQUESTEXTENSIONANGLEPROC>(
-            eglGetProcAddress("glRequestExtensionANGLE"));
-    }
+    void MultiviewTestBaseSetUp() { ANGLETestBase::ANGLETestSetUp(); }
 
     void MultiviewTestBaseTearDown() { ANGLETestBase::ANGLETestTearDown(); }
-
-    PFNGLREQUESTEXTENSIONANGLEPROC glRequestExtensionANGLE = nullptr;
 };
 
 // Base class for multiview tests that don't need specific helper functions.