Add R_8 GPU memory buffers format.

gpu/command_buffer/tests/gl_gpu_memory_buffer_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/gl2chromium.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 using testing::Invoke;
 using testing::Return;
 using testing::SetArgPointee;
 using testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
 static const int kImageWidth = 32;
 static const int kImageHeight = 32;
-static const int kImageBytesPerPixel = 4;
 
-class GpuMemoryBufferTest : public testing::Test {
+class GpuMemoryBufferTest
+    : public testing::TestWithParam<gfx::GpuMemoryBuffer::Format> {
  protected:
   void SetUp() override {
     gl_.Initialize(GLManager::Options());
     gl_.MakeCurrent();
 
     glGenTextures(2, texture_ids_);
     glBindTexture(GL_TEXTURE_2D, texture_ids_[1]);
 
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@@ skipping 15 matching lines @@
 
     gl_.Destroy();
   }
 
   GLManager gl_;
   GLuint texture_ids_[2];
   GLuint framebuffer_id_;
 };
 
 // An end to end test that tests the whole GpuMemoryBuffer lifecycle.
-TEST_F(GpuMemoryBufferTest, Lifecycle) {
+TEST_P(GpuMemoryBufferTest, Lifecycle) {
   uint8 pixels[1 * 4] = { 255u, 0u, 0u, 255u };
 
   scoped_ptr<gfx::GpuMemoryBuffer> buffer(gl_.CreateGpuMemoryBuffer(
-      gfx::Size(kImageWidth, kImageHeight), gfx::GpuMemoryBuffer::RGBA_8888));
+      gfx::Size(kImageWidth, kImageHeight), GetParam()));
 
   // Map buffer for writing.
   void* data;
   bool rv = buffer->Map(&data);
   DCHECK(rv);
 
   uint8* mapped_buffer = static_cast<uint8*>(data);
   ASSERT_TRUE(mapped_buffer != NULL);
 
   // Assign a value to each pixel.
-  int stride = kImageWidth * kImageBytesPerPixel;
+  int imageBytesPerPixel = GetParam() == gfx::GpuMemoryBuffer::R_8 ? 1 : 4;

[reveman, 2015/04/01 23:38:55]

Can you refactor this test a bit so this conditional is not needed? Maybe just
memset(mapped_buffer + y * stride, 0xff, ..) instead

[Daniele Castagna, 2015/04/03 01:08:15]

Refactored, refer to crrev.com/1055143003.

+  uint32 stride = 0;
+  buffer->GetStride(&stride);
   for (int x = 0; x < kImageWidth; ++x) {
     for (int y = 0; y < kImageHeight; ++y) {
-      mapped_buffer[y * stride + x * kImageBytesPerPixel + 0] = pixels[0];
-      mapped_buffer[y * stride + x * kImageBytesPerPixel + 1] = pixels[1];
-      mapped_buffer[y * stride + x * kImageBytesPerPixel + 2] = pixels[2];
-      mapped_buffer[y * stride + x * kImageBytesPerPixel + 3] = pixels[3];
+      for (int p = 0; p < imageBytesPerPixel; ++p) {
+        mapped_buffer[y * stride + x * imageBytesPerPixel + p] = pixels[p];
+      }
     }
   }
 
   // Unmap the buffer.
   buffer->Unmap();
 
+  GLenum internalformat = GL_RGBA;
+  if (GetParam() == gfx::GpuMemoryBuffer::R_8) {

[reveman, 2015/04/01 23:38:55]

I prefer a switch statement where you explicitly handle all formats. and I guess
you can NOTREACHED if the format is invalid even though this is just a test...

[Daniele Castagna, 2015/04/03 01:08:15]

This will change after crrev.com/1055143003

+    internalformat =
+        gl_.decoder()->GetCapabilities().texture_rg ? GL_R8 : GL_LUMINANCE;
+  }
   // Create the image. This should add the image ID to the ImageManager.
-  GLuint image_id = glCreateImageCHROMIUM(
-      buffer->AsClientBuffer(), kImageWidth, kImageHeight, GL_RGBA);
+  GLuint image_id = glCreateImageCHROMIUM(buffer->AsClientBuffer(), kImageWidth,
+                                          kImageHeight, internalformat);
   EXPECT_NE(0u, image_id);
   EXPECT_TRUE(gl_.decoder()->GetImageManager()->LookupImage(image_id) != NULL);
 
   // Bind the texture and the image.
   glBindTexture(GL_TEXTURE_2D, texture_ids_[0]);
   glBindTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
 
   // Copy texture so we can verify result using CheckPixels.
   glCopyTextureCHROMIUM(GL_TEXTURE_2D,
                         texture_ids_[0],
                         texture_ids_[1],
                         GL_RGBA,
                         GL_UNSIGNED_BYTE);
   EXPECT_TRUE(glGetError() == GL_NO_ERROR);
 
   // Check if pixels match the values that were assigned to the mapped buffer.
   GLTestHelper::CheckPixels(0, 0, kImageWidth, kImageHeight, 0, pixels);
   EXPECT_TRUE(GL_NO_ERROR == glGetError());
 
   // Release the image.
   glReleaseTexImage2DCHROMIUM(GL_TEXTURE_2D, image_id);
 
   // Destroy the image.
   glDestroyImageCHROMIUM(image_id);
 }
 
+static const gfx::GpuMemoryBuffer::Format kMemoryBufferFormats[] = {

[reveman, 2015/04/01 23:38:55]

It would be nice to test all formats here and not just R_8 and RGBA_8888. How
about landing a patch that refactor this test to try all formats prior to this
CL?

[Daniele Castagna, 2015/04/03 01:08:15]

crrev.com/1055143003

+    gfx::GpuMemoryBuffer::RGBA_8888,
+    gfx::GpuMemoryBuffer::R_8};

[reveman, 2015/04/01 23:38:55]

nit: use the same order as where the enum is defined

[Daniele Castagna, 2015/04/03 01:08:15]

Refer to crrev.com/1055143003

+INSTANTIATE_TEST_CASE_P(
+    GpuMemoryBufferTests,
+    GpuMemoryBufferTest,
+    ::testing::ValuesIn(std::vector<gfx::GpuMemoryBuffer::Format>(
+        kMemoryBufferFormats,
+        kMemoryBufferFormats + arraysize(kMemoryBufferFormats))));

[reveman, 2015/04/01 23:38:55]

How about:

INSTANTIATE_TEST_CASE_P(
    GpuMemoryBufferTests,
    GpuMemoryBufferTest,
    ::testing::Values(gfx::GpuMemoryBuffer::R_8,
                      gfx::GpuMemoryBuffer::RGBA_8888))

[Daniele Castagna, 2015/04/03 01:08:15]

Much better.
Used it in crrev.com/1055143003

+
 }  // namespace gles2
 }  // namespace gpu