Ignore clear commands if rasterizer discard is enabled.

src/libANGLE/Framebuffer.cpp

@@ -559,6 +559,11 @@ Error Framebuffer::invalidateSub(size_t count, const GLenum *attachments, const
 
 Error Framebuffer::clear(Context *context, GLbitfield mask)
 {
+    if (context->getState().isRasterizerDiscardEnabled())
+    {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     // Sync the clear state
     context->syncRendererState(context->getState().clearStateBitMask());
 
@@ -570,6 +575,11 @@ Error Framebuffer::clearBufferfv(Context *context,
                                  GLint drawbuffer,
                                  const GLfloat *values)
 {
+    if (context->getState().isRasterizerDiscardEnabled())
+    {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     // Sync the clear state
     context->syncRendererState(context->getState().clearStateBitMask());
 
@@ -581,6 +591,11 @@ Error Framebuffer::clearBufferuiv(Context *context,
                                   GLint drawbuffer,
                                   const GLuint *values)
 {
+    if (context->getState().isRasterizerDiscardEnabled())
+    {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     // Sync the clear state
     context->syncRendererState(context->getState().clearStateBitMask());
 
@@ -592,6 +607,11 @@ Error Framebuffer::clearBufferiv(Context *context,
                                  GLint drawbuffer,
                                  const GLint *values)
 {
+    if (context->getState().isRasterizerDiscardEnabled())
+    {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     // Sync the clear state
     context->syncRendererState(context->getState().clearStateBitMask());
 
@@ -604,6 +624,11 @@ Error Framebuffer::clearBufferfi(Context *context,
                                  GLfloat depth,
                                  GLint stencil)
 {
+    if (context->getState().isRasterizerDiscardEnabled())
+    {
+        return gl::Error(GL_NO_ERROR);
+    }
+
     // Sync the clear state
     context->syncRendererState(context->getState().clearStateBitMask());
 

src/tests/deqp_support/deqp_gles3_test_expectations.txt

@@ -805,10 +805,6 @@
 1099 WIN : dEQP-GLES3.functional.attribute_location.bind_relink_hole.mat2x2 = FAIL
 1099 WIN : dEQP-GLES3.functional.attribute_location.mixed_relink_hole.mat2 = FAIL
 1099 WIN : dEQP-GLES3.functional.attribute_location.mixed_relink_hole.mat2x2 = FAIL
-1101 WIN : dEQP-GLES3.functional.rasterizer_discard.basic.clear_color = FAIL
-1101 WIN : dEQP-GLES3.functional.rasterizer_discard.scissor.clear_color = FAIL
-1101 WIN : dEQP-GLES3.functional.rasterizer_discard.fbo.clear_color = FAIL
-1101 WIN : dEQP-GLES3.functional.rasterizer_discard.fbo.clear_depth = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.buffer.draw_buffers = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.buffer.read_buffer = FAIL
 1101 WIN : dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage = FAIL