commit 190d9a81671d7ca0c725787e69471f1b0d2c3e34
author Shahbaz Youssefi <syoussefi@chromium.org> Fri Nov 29 09:57:40 2019 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Dec 02 21:22:11 2019 +0000
tree a9555d08c901464c450403117c1d2e822a57c25b
parent 745999a9763346d7ed6c1091c710722873b9db09

Fix RenderingLimitToDefaultFBOSizeWithNoAttachments test

MAX_DRAW_BUFFERS has a minimum value of 4.  This test was
unconditionally using 6 draw buffers.

Bug: angleproject:4092
Bug: angleproject:4180
Change-Id: I069874a6402da1cb007bf9504e68b9910951cf63
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1944527
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Alexis Hétu <sugoi@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

src/tests/gl_tests/FramebufferTest.cpp

diff --git a/src/tests/gl_tests/FramebufferTest.cpp b/src/tests/gl_tests/FramebufferTest.cpp
index 9ba0571..bf69a6c 100644
--- a/src/tests/gl_tests/FramebufferTest.cpp
+++ b/src/tests/gl_tests/FramebufferTest.cpp
@@ -990,8 +990,6 @@
     ANGLE_SKIP_TEST_IF(IsLinux() && IsAMD() && IsDesktopOpenGL());
     // Occlusion query reports fragments outside the render area are still rendered
     ANGLE_SKIP_TEST_IF(IsAndroid() || (IsWindows() && (IsIntel() || IsAMD())));
-    // http://anglebug.com/4092
-    ANGLE_SKIP_TEST_IF(isSwiftshader());
 
     constexpr char kVS1[] = R"(#version 310 es
 in layout(location = 0) highp vec2 a_position;
@@ -1002,7 +1000,7 @@
 
     constexpr char kFS1[] = R"(#version 310 es
 uniform layout(location = 0) highp ivec2 u_expectedSize;
-out layout(location = 5) mediump vec4 f_color;
+out layout(location = 3) mediump vec4 f_color;
 void main()
 {
     if (ivec2(gl_FragCoord.xy) != u_expectedSize) discard;
@@ -1076,18 +1074,18 @@
     glBindTexture(GL_TEXTURE_2D, mTexture.get());
     glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, width, height);
 
-    const GLenum bufs[] = {GL_NONE, GL_NONE, GL_NONE, GL_NONE, GL_NONE, GL_COLOR_ATTACHMENT5};
+    const GLenum bufs[] = {GL_NONE, GL_NONE, GL_NONE, GL_COLOR_ATTACHMENT3};
 
-    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT5, GL_TEXTURE_2D, mTexture.get(),
+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT3, GL_TEXTURE_2D, mTexture.get(),
                            0);
     EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
-    glDrawBuffers(6, bufs);
+    glDrawBuffers(4, bufs);
 
     validateSamplePass(query, passedCount, width, height);
 
     // If fbo's attachment has been removed, the rendering size should be the same as framebuffer
     // default size.
-    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT5, 0, 0, 0);
+    glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT3, 0, 0, 0);
     EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
 
     validateSamplePass(query, passedCount, defaultWidth, defaultHeight);