tests: Skip WebGL/EnableProgramBinaryExtension with no formats

If the extensions is exposed, but the backend doesn't support binary formats, then the part of the tests loading and storing a binary shader are skipped. With that also Capture/Replay of the test is fixed. Bug: angleproject:6112 Change-Id: Iaa25860a9be69207e4dbd6213cf77e75fd87a766 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2993090 Commit-Queue: Gert Wollny <gert.wollny@collabora.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

tests: Skip WebGL/EnableProgramBinaryExtension with no formats
4b464dd4 · Gert Wollny · Angle LUCI CQ · b3e920e2 · 4b464dd4 · 4b464dd4
Commit 4b464dd4 authored Jun 28, 2021 by Gert Wollny Committed by Angle LUCI CQ Jul 07, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

capture_replay_expectations.txt ...ests/capture_replay_tests/capture_replay_expectations.txt +0 -1

WebGLCompatibilityTest.cpp src/tests/gl_tests/WebGLCompatibilityTest.cpp +7 -3

No files found.
--- a/src/tests/capture_replay_tests/capture_replay_expectations.txt
+++ b/src/tests/capture_replay_tests/capture_replay_expectations.txt
@@ -53,7 +53,6 @@ VertexAttributeTest.*
 ViewportTest.*
 VulkanExternalImageTest.*

-WebGLCompatibilityTest.EnableProgramBinaryExtension/*
 WebGLCompatibilityTest.MultiContextNoRenderingFeedbackLoops/*
 WebGLFramebufferTest.*


--- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
@@ -1147,8 +1147,9 @@ TEST_P(WebGLCompatibilityTest, EnableProgramBinaryExtension)
    // This extensions become core in in ES3/WebGL2.
    ANGLE_SKIP_TEST_IF(getClientMajorVersion() >= 3);

-    GLint result = 0;
-    glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &result);
+    GLint result           = 0;
+    GLint numBinaryFormats = 0;
+    glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinaryFormats);
    EXPECT_GL_ERROR(GL_INVALID_ENUM);

    glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, &result);
@@ -1182,7 +1183,10 @@ void main()
        glRequestExtensionANGLE("GL_OES_get_program_binary");
        EXPECT_GL_NO_ERROR();

-        glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &result);
+        glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinaryFormats);
+        // No use to test further if no binary formats are supported
+        ANGLE_SKIP_TEST_IF(numBinaryFormats < 1);
+
        glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, &result);
        EXPECT_GL_NO_ERROR();