SixteenBppTextureTest: test the FBO are renderable before drawing

It is valid for the implementation to return a GL_FRAMEBUFFER_UNSUPPORTED for framebuffer completeness. Check for that case and return early. This fixes the RGB5_A1 tests on Mac that doesn't support rendering to this format. BUG=angleproject:891 Change-Id: If37d8f82e994a93a470cbdc01d758fe60d54a5b2 Reviewed-on: https://chromium-review.googlesource.com/298863Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Tryjob-Request: Geoff Lang <geofflang@chromium.org> Tryjob-Request: Corentin Wallez <cwallez@chromium.org> Tested-by: Corentin Wallez <cwallez@chromium.org>

SixteenBppTextureTest: test the FBO are renderable before drawing
934cd2e5 · Corentin Wallez · 0baaca68 · 934cd2e5
Commit 934cd2e5 authored Sep 11, 2015 by Corentin Wallez
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 12 deletions

SixteenBppTextureTest.cpp src/tests/gl_tests/SixteenBppTextureTest.cpp +26 -12

No files found.
--- a/src/tests/gl_tests/SixteenBppTextureTest.cpp
+++ b/src/tests/gl_tests/SixteenBppTextureTest.cpp
@@ -106,12 +106,19 @@ class SixteenBppTextureTest : public ANGLETest
        glBindTexture(GL_TEXTURE_2D, 0);
        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
-        glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+        if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_UNSUPPORTED)
-        glClear(GL_COLOR_BUFFER_BIT);
+        {
-        EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
+            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
-        EXPECT_PIXEL_EQ(1, 0, 255, 0, 0, 255);
+            glClear(GL_COLOR_BUFFER_BIT);
-        EXPECT_PIXEL_EQ(1, 1, 255, 0, 0, 255);
+            EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
-        EXPECT_PIXEL_EQ(0, 1, 255, 0, 0, 255);
+            EXPECT_PIXEL_EQ(1, 0, 255, 0, 0, 255);
+            EXPECT_PIXEL_EQ(1, 1, 255, 0, 0, 255);
+            EXPECT_PIXEL_EQ(0, 1, 255, 0, 0, 255);
+        }
+        else
+        {
+            std::cout << "Skipping rendering to an unsupported framebuffer format" << std::endl;
+        }
        glDeleteFramebuffers(1, &fbo);
    }
@@ -229,13 +236,20 @@ TEST_P(SixteenBppTextureTest, RGBA5551ClearAlpha)
    glBindTexture(GL_TEXTURE_2D, 0);
    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_UNSUPPORTED)
-    glClear(GL_COLOR_BUFFER_BIT);
+    {
-    EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 0);
+        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        glClear(GL_COLOR_BUFFER_BIT);
+        EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 0);
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT);
+        glClear(GL_COLOR_BUFFER_BIT);
-    EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 255);
+        EXPECT_PIXEL_EQ(0, 0, 0, 0, 0, 255);
+    }
+    else
+    {
+        std::cout << "Skipping rendering to an unsupported framebuffer format" << std::endl;
+    }
    glDeleteFramebuffers(1, &fbo);
    glDeleteTextures(1, &tex);