Revert of Implement helper functionalities for computing image size with ES3 settings.

gpu/command_buffer/common/gles2_cmd_utils_unittest.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 #include <limits>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 302 matching lines @@
   EXPECT_EQ(kWidth * 3 + 3, padded_row_size);
   EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
       kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, 8, &size,
       &unpadded_row_size, &padded_row_size));
   EXPECT_EQ((kWidth * 3 + 7) * (kHeight * kDepth - 1) +
             kWidth * 3, size);
   EXPECT_EQ(kWidth * 3, unpadded_row_size);
   EXPECT_EQ(kWidth * 3 + 7, padded_row_size);
 }
 
-TEST_F(GLES2UtilTest, ComputeImageDataSizePixelStoreParams) {
-  const uint32_t kWidth = 3;
-  const uint32_t kHeight = 3;
-  const uint32_t kDepth = 3;
-  uint32_t size;
-  uint32_t unpadded_row_size;
-  uint32_t padded_row_size;
-  uint32_t skip_size;
-
-  {  // Default
-    PixelStoreParams params;
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(kWidth * 3, unpadded_row_size);
-    EXPECT_EQ(kWidth * 3 + 3, padded_row_size);
-    EXPECT_EQ(padded_row_size * (kHeight * kDepth - 1) + unpadded_row_size,
-              size);
-    EXPECT_EQ(0u, skip_size);
-  }
-
-  {  // row_length > width
-    PixelStoreParams params;
-    params.row_length = kWidth + 2;
-    uint32_t kPadding = 1;  // 5 * 3 = 15 -> 16
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(static_cast<uint32_t>(kWidth * 3), unpadded_row_size);
-    EXPECT_EQ(static_cast<uint32_t>(params.row_length * 3 + kPadding),
-              padded_row_size);
-    EXPECT_EQ(padded_row_size * (kHeight * kDepth - 1) + unpadded_row_size,
-              size);
-    EXPECT_EQ(0u, skip_size);
-  }
-
-  {  // row_length < width
-    PixelStoreParams params;
-    params.row_length = kWidth - 1;
-    uint32_t kPadding = 2;  // 2 * 3 = 6 -> 8
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(static_cast<uint32_t>(kWidth * 3), unpadded_row_size);
-    EXPECT_EQ(static_cast<uint32_t>(params.row_length * 3 + kPadding),
-              padded_row_size);
-    EXPECT_EQ(padded_row_size * (kHeight * kDepth - 1) + unpadded_row_size,
-              size);
-    EXPECT_EQ(0u, skip_size);
-  }
-
-  {  // image_height > height
-    PixelStoreParams params;
-    params.image_height = kHeight + 1;
-    uint32_t kPadding = 3; // 3 * 3 = 9 -> 21
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(kWidth * 3, unpadded_row_size);
-    EXPECT_EQ(kWidth * 3 + kPadding, padded_row_size);
-    EXPECT_EQ((params.image_height * (kDepth - 1) + kHeight - 1) *
-              padded_row_size + unpadded_row_size, size);
-    EXPECT_EQ(0u, skip_size);
-  }
-
-  {  // image_height < height
-    PixelStoreParams params;
-    params.image_height = kHeight - 1;
-    uint32_t kPadding = 3; // 3 * 3 = 9 -> 12
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(kWidth * 3, unpadded_row_size);
-    EXPECT_EQ(kWidth * 3 + kPadding, padded_row_size);
-    EXPECT_EQ((params.image_height * (kDepth - 1) + kHeight - 1) *
-              padded_row_size + unpadded_row_size, size);
-    EXPECT_EQ(0u, skip_size);
-  }
-
-  {  // skip_pixels, skip_rows, skip_images, alignment = 4, RGB
-    PixelStoreParams params;
-    params.skip_pixels = 1;
-    params.skip_rows = 10;
-    params.skip_images = 2;
-    uint32_t kPadding = 3; // 3 * 3 = 9 -> 12
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(kWidth * 3, unpadded_row_size);
-    EXPECT_EQ(kWidth * 3 + kPadding, padded_row_size);
-    EXPECT_EQ(padded_row_size * kHeight * params.skip_images +
-              padded_row_size * params.skip_rows + 3 * params.skip_pixels,
-              skip_size);
-    EXPECT_EQ(padded_row_size * (kWidth * kDepth - 1) + unpadded_row_size,
-              size);
-  }
-
-  {  // skip_pixels, skip_rows, skip_images, alignment = 8, RGBA
-    PixelStoreParams params;
-    params.skip_pixels = 1;
-    params.skip_rows = 10;
-    params.skip_images = 2;
-    params.alignment = 8;
-    uint32_t kPadding = 4; // 3 * 4 = 12 -> 16
-    EXPECT_TRUE(GLES2Util::ComputeImageDataSizesES3(
-        kWidth, kHeight, kDepth, GL_RGBA, GL_UNSIGNED_BYTE, params,
-        &size, &unpadded_row_size, &padded_row_size, &skip_size));
-    EXPECT_EQ(kWidth * 4, unpadded_row_size);
-    EXPECT_EQ(kWidth * 4 + kPadding, padded_row_size);
-    EXPECT_EQ(padded_row_size * kHeight * params.skip_images +
-              padded_row_size * params.skip_rows + 4 * params.skip_pixels,
-              skip_size);
-    EXPECT_EQ(padded_row_size * (kWidth * kDepth - 1) + unpadded_row_size,
-              size);
-  }
-}
-
 TEST_F(GLES2UtilTest, RenderbufferBytesPerPixel) {
    EXPECT_EQ(1u, GLES2Util::RenderbufferBytesPerPixel(GL_STENCIL_INDEX8));
    EXPECT_EQ(2u, GLES2Util::RenderbufferBytesPerPixel(GL_RGBA4));
    EXPECT_EQ(2u, GLES2Util::RenderbufferBytesPerPixel(GL_RGB565));
    EXPECT_EQ(2u, GLES2Util::RenderbufferBytesPerPixel(GL_RGB5_A1));
    EXPECT_EQ(2u, GLES2Util::RenderbufferBytesPerPixel(GL_DEPTH_COMPONENT16));
    EXPECT_EQ(4u, GLES2Util::RenderbufferBytesPerPixel(GL_RGB));
    EXPECT_EQ(4u, GLES2Util::RenderbufferBytesPerPixel(GL_RGBA));
    EXPECT_EQ(
        4u, GLES2Util::RenderbufferBytesPerPixel(GL_DEPTH24_STENCIL8_OES));
@@ skipping 64 matching lines @@
     if (!parsed_name.IsArrayName()) {
       continue;
     }
     EXPECT_EQ(testcase.base_name, parsed_name.base_name());
     EXPECT_EQ(testcase.element_index, parsed_name.element_index());
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu