commit 90208e95eaec802f9e3fd80c6a20543f16eb191a
author Geoff Lang <geofflang@chromium.org> Mon Oct 05 15:40:36 2015 -0400
committer Geoff Lang <geofflang@chromium.org> Mon Oct 05 20:57:41 2015 +0000
tree fa5ba0b2fd41f69e91198324b2a7d0200d5d0763
parent 33bb5ad676e78471cd11bef9d0fa61baa7b0fea1

Check for GL_OES_get_program_binary before running ProgramBinaryTest.

BUG=angleproject:882

Change-Id: I2e5f4aeac6ff413d5f69097957718c52bd7828dd
Reviewed-on: https://chromium-review.googlesource.com/304170
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/ProgramBinaryTest.cpp

diff --git a/src/tests/gl_tests/ProgramBinaryTest.cpp b/src/tests/gl_tests/ProgramBinaryTest.cpp
index 0d52dc1..1f32f6b 100644
--- a/src/tests/gl_tests/ProgramBinaryTest.cpp
+++ b/src/tests/gl_tests/ProgramBinaryTest.cpp
@@ -71,6 +71,13 @@
         ANGLETest::TearDown();
     }
 
+    GLint getAvailableProgramBinaryFormatCount() const
+    {
+        GLint formatCount;
+        glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS_OES, &formatCount);
+        return formatCount;
+    }
+
     GLuint mProgram;
     GLuint mBuffer;
 };
@@ -79,6 +86,19 @@
 // should not internally cause a vertex shader recompile (for conversion).
 TEST_P(ProgramBinaryTest, FloatDynamicShaderSize)
 {
+    if (!extensionEnabled("GL_OES_get_program_binary"))
+    {
+        std::cout << "Test skipped because GL_OES_get_program_binary is not available."
+                  << std::endl;
+        return;
+    }
+
+    if (getAvailableProgramBinaryFormatCount() == 0)
+    {
+        std::cout << "Test skipped because no program binary formats are available." << std::endl;
+        return;
+    }
+
     glUseProgram(mProgram);
     glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
 
@@ -107,6 +127,19 @@
 // This tests the ability to successfully save and load a program binary.
 TEST_P(ProgramBinaryTest, SaveAndLoadBinary)
 {
+    if (!extensionEnabled("GL_OES_get_program_binary"))
+    {
+        std::cout << "Test skipped because GL_OES_get_program_binary is not available."
+                  << std::endl;
+        return;
+    }
+
+    if (getAvailableProgramBinaryFormatCount() == 0)
+    {
+        std::cout << "Test skipped because no program binary formats are available." << std::endl;
+        return;
+    }
+
     GLint programLength = 0;
     GLint writtenLength = 0;
     GLenum binaryFormat = 0;
@@ -164,7 +197,12 @@
 }
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
-ANGLE_INSTANTIATE_TEST(ProgramBinaryTest, ES2_D3D9(), ES2_D3D11());
+ANGLE_INSTANTIATE_TEST(ProgramBinaryTest,
+                       ES2_D3D9(),
+                       ES2_D3D11(),
+                       ES3_D3D11(),
+                       ES2_OPENGL(),
+                       ES3_OPENGL());
 
 // For the ProgramBinariesAcrossPlatforms tests, we need two sets of params:
 // - a set to save the program binary