gpu: Fix a bug in the new ReturnFrontBuffer() path for pepper.

gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 38 matching lines @@
   glBindFramebuffer(GL_FRAMEBUFFER, old_fbo);
 
   glDeleteFramebuffers(1, &fbo);
 
   return texel;
 }
 }
 
 class GLTextureMailboxTest : public testing::Test {
  protected:
-  void SetUp() override {
+  void SetUpContexts() {
     gl1_.Initialize(GLManager::Options());
     GLManager::Options options;
     options.share_mailbox_manager = &gl1_;
     gl2_.Initialize(options);
   }
 
   void TearDown() override {
     gl1_.Destroy();
     gl2_.Destroy();
   }
@@ skipping 19 matching lines @@
     glFlush();
     gl1_.MakeCurrent();
     return mailbox;
   }
 
   GLManager gl1_;
   GLManager gl2_;
 };
 
 TEST_F(GLTextureMailboxTest, ProduceAndConsumeTexture) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
@@ skipping 24 matching lines @@
   glFlush();
 
   gl1_.MakeCurrent();
 
   glBindTexture(GL_TEXTURE_2D, tex1);
   glConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox2);
   EXPECT_EQ(source_pixel, ReadTexel(tex1, 0, 0));
 }
 
 TEST_F(GLTextureMailboxTest, ProduceAndConsumeTextureRGB) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
@@ skipping 24 matching lines @@
   glFlush();
 
   gl1_.MakeCurrent();
 
   glBindTexture(GL_TEXTURE_2D, tex1);
   glConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox2);
   EXPECT_EQ(source_pixel, ReadTexel(tex1, 0, 0));
 }
 
 TEST_F(GLTextureMailboxTest, ProduceAndConsumeTextureDirect) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLbyte mailbox2[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox2);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
@@ skipping 21 matching lines @@
   glFlush();
 
   gl1_.MakeCurrent();
 
   GLuint tex3 = glCreateAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox2);
   glBindTexture(GL_TEXTURE_2D, tex3);
   EXPECT_EQ(source_pixel, ReadTexel(tex3, 0, 0));
 }
 
 TEST_F(GLTextureMailboxTest, ConsumeTextureValidatesKey) {
+  SetUpContexts();
   GLuint tex;
   glGenTextures(1, &tex);
 
   glBindTexture(GL_TEXTURE_2D, tex);
   uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   GLbyte invalid_mailbox[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(invalid_mailbox);
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   glConsumeTextureCHROMIUM(GL_TEXTURE_2D, invalid_mailbox);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 
   // Ensure level 0 is still intact after glConsumeTextureCHROMIUM fails.
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   EXPECT_EQ(source_pixel, ReadTexel(tex, 0, 0));
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 TEST_F(GLTextureMailboxTest, SharedTextures) {
+  SetUpContexts();
   gl1_.MakeCurrent();
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_2D, tex1);
   uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_2D,
                0,
                GL_RGBA,
                1, 1,
@@ skipping 78 matching lines @@
   // Mailbox should be gone now.
   glGenTextures(1, &tex2);
   glBindTexture(GL_TEXTURE_2D, tex2);
   glConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
   glDeleteTextures(1, &tex2);
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 TEST_F(GLTextureMailboxTest, TakeFrontBuffer) {
+  SetUpContexts();
   gl1_.MakeCurrent();
   Mailbox mailbox;
   glGenMailboxCHROMIUM(mailbox.name);
 
   gl2_.MakeCurrent();
   glResizeCHROMIUM(10, 10, 1, true);
   glClearColor(0, 1, 1, 1);
   glClear(GL_COLOR_BUFFER_BIT);
   ::gles2::GetGLContext()->SwapBuffers();
   gl2_.decoder()->TakeFrontBuffer(mailbox);
@@ skipping 41 matching lines @@
 
   gl1_.MakeCurrent();
   EXPECT_EQ(0xFF0000FFu, ReadTexel(tex1, 0, 0));
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   glDeleteTextures(1, &tex1);
 }
 
 // The client, represented by |gl2_|, will request 5 frontbuffers, and then
 // start returning them.
 TEST_F(GLTextureMailboxTest, FrontBufferCache) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   std::vector<Mailbox> mailboxes;
   for (int i = 0; i < 5; ++i) {
     Mailbox mailbox = TakeAndConsumeMailbox();
     mailboxes.push_back(mailbox);
   }
   EXPECT_EQ(5u, gl1_.decoder()->GetSavedBackTextureCountForTest());
   EXPECT_EQ(5u, gl1_.decoder()->GetCreatedBackTextureCountForTest());
 
@@ skipping 19 matching lines @@
   }
 
   EXPECT_EQ(5u, gl1_.decoder()->GetSavedBackTextureCountForTest());
   EXPECT_EQ(105u, gl1_.decoder()->GetCreatedBackTextureCountForTest());
 }
 
 // The client, represented by |gl2_|, will request and return 5 frontbuffers.
 // Then the size of the buffer will be changed. All cached frontbuffers should
 // be discarded.
 TEST_F(GLTextureMailboxTest, FrontBufferChangeSize) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   std::vector<Mailbox> mailboxes;
   for (int i = 0; i < 5; ++i) {
     Mailbox mailbox = TakeAndConsumeMailbox();
     mailboxes.push_back(mailbox);
   }
   EXPECT_EQ(5u, gl1_.decoder()->GetSavedBackTextureCountForTest());
 
   for (int i = 0; i < 5; ++i) {
     gl1_.decoder()->ReturnFrontBuffer(mailboxes[i], false);
   }
   mailboxes.clear();
   EXPECT_EQ(5u, gl1_.decoder()->GetSavedBackTextureCountForTest());
 
   glResizeCHROMIUM(21, 31, 1, true);
   ::gles2::GetGLContext()->SwapBuffers();
   EXPECT_EQ(0u, gl1_.decoder()->GetSavedBackTextureCountForTest());
 }
 
+// The client, represented by |gl2_|, will request and return 5 frontbuffers.
+// Then |gl1_| will start drawing with a different color. The returned
+// frontbuffers should pick up the new color.
+TEST_F(GLTextureMailboxTest, FrontBufferChangeColor) {
+  GLManager::Options options1;
+  options1.multisampled = true;
+  gl1_.Initialize(options1);
+
+  GLManager::Options options2;
+  options2.share_mailbox_manager = &gl1_;
+  gl2_.Initialize(options2);
+
+  gl1_.MakeCurrent();
+  std::vector<Mailbox> mailboxes;
+  for (int i = 0; i < 5; ++i) {
+    Mailbox mailbox = TakeAndConsumeMailbox();
+    mailboxes.push_back(mailbox);
+  }
+
+  for (int i = 0; i < 5; ++i) {
+    gl1_.decoder()->ReturnFrontBuffer(mailboxes[i], false);
+  }
+  mailboxes.clear();
+
+  for (int i = 0; i < 5; ++i) {
+    glClearColor(1, 0, 0, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+    ::gles2::GetGLContext()->SwapBuffers();
+
+    Mailbox mailbox;
+    glGenMailboxCHROMIUM(mailbox.name);
+    gl1_.decoder()->TakeFrontBuffer(mailbox);
+
+    // Normally, consumers of TakeFrontBuffer() must supply their own
+    // synchronization mechanism. For this test, just use a glFinish().
+    glFinish();
+
+    gl2_.MakeCurrent();
+    GLuint tex;
+    glGenTextures(1, &tex);
+    glBindTexture(GL_TEXTURE_2D, tex);
+    glConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
+
+    EXPECT_EQ(0xFF0000FFu, ReadTexel(tex, 0, 0));
+
+    glDeleteTextures(1, &tex);
+    glFlush();
+    gl1_.MakeCurrent();
+  }
+}
+
 TEST_F(GLTextureMailboxTest, ProduceTextureDirectInvalidTarget) {
+  SetUpContexts();
   gl1_.MakeCurrent();
 
   GLbyte mailbox1[GL_MAILBOX_SIZE_CHROMIUM];
   glGenMailboxCHROMIUM(mailbox1);
 
   GLuint tex1;
   glGenTextures(1, &tex1);
 
   glBindTexture(GL_TEXTURE_CUBE_MAP, tex1);
   uint32_t source_pixel = 0xFF0000FF;
   glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X,
                0,
                GL_RGBA,
                1, 1,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
                &source_pixel);
 
   glProduceTextureDirectCHROMIUM(tex1, GL_TEXTURE_2D, mailbox1);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 }
 
 // http://crbug.com/281565
 #if !defined(OS_ANDROID)
 TEST_F(GLTextureMailboxTest, TakeFrontBufferMultipleContexts) {
+  SetUpContexts();
   gl1_.MakeCurrent();
   Mailbox mailbox[2];
   glGenMailboxCHROMIUM(mailbox[0].name);
   glGenMailboxCHROMIUM(mailbox[1].name);
   GLuint tex[2];
   glGenTextures(2, tex);
 
   GLManager::Options options;
   options.share_mailbox_manager = &gl1_;
   GLManager other_gl[2];
@@ skipping 26 matching lines @@
     other_gl[i].Destroy();
   }
 
   gl1_.MakeCurrent();
   glDeleteTextures(2, tex);
 }
 #endif
 
 }  // namespace gpu