Merge "Set bit in blit mask to settle ambiguity" into nyc-dev

am: 78bda03

* commit '78bda03a6167c6697598f3f4497b4f0afb687c0c':
  Set bit in blit mask to settle ambiguity

diff --git a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
index aba9705..1d3b046 100644 (file)
--- a/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeBufferApiTests.cpp
@@ -1487,7 +1487,7 @@ void blit_framebuffer (NegativeTestContext& ctx)
        ctx.beginSection("GL_INVALID_OPERATION is generated if the source and destination buffers are identical.");
        ctx.glBindFramebuffer           (GL_DRAW_FRAMEBUFFER, fbo[0]);
        ctx.expectError                         (GL_NO_ERROR);
-       ctx.glBlitFramebuffer           (0, 0, 16, 16, 0, 0, 16, 16, 0, GL_NEAREST);
+       ctx.glBlitFramebuffer           (0, 0, 16, 16, 0, 0, 16, 16, GL_DEPTH_BUFFER_BIT, GL_NEAREST);
        ctx.expectError                         (GL_INVALID_OPERATION);
        // restore
        ctx.glBindFramebuffer           (GL_DRAW_FRAMEBUFFER, fbo[1]);