Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/common/gles2_cmd_utils_unittest.cc

Issue 851503003: Update from https://crrev.com/311076 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | gpu/command_buffer/service/context_group.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
diff --git a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
index d0e7e037ebce3fd0029bf8c18328ac2b64c88b50..2b1c93eb5d3b478042639b7f5453fe5727bd20b0 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
+++ b/gpu/command_buffer/common/gles2_cmd_utils_unittest.cc
@@ -8,6 +8,7 @@
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <GLES2/gl2extchromium.h>
+#include <GLES3/gl3.h>
#include "testing/gtest/include/gtest/gtest.h"
@@ -95,54 +96,83 @@ TEST_F(GLES2UtilTest, ComputeImageDataSizesFormats) {
uint32_t unpadded_row_size;
uint32_t padded_row_size;
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 3, size);
EXPECT_EQ(kWidth * 3, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 4, size);
EXPECT_EQ(kWidth * 4, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1, &size,
+ kWidth, kHeight, 1, GL_LUMINANCE, GL_UNSIGNED_BYTE, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 1, size);
EXPECT_EQ(kWidth * 1, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1, &size,
+ kWidth, kHeight, 1, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 2, size);
EXPECT_EQ(kWidth * 2, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_BGRA_EXT, GL_UNSIGNED_BYTE, 1, &size,
+ kWidth, kHeight, 1, GL_BGRA_EXT, GL_UNSIGNED_BYTE, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 4, size);
EXPECT_EQ(kWidth * 4, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_ALPHA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_ALPHA, GL_UNSIGNED_BYTE, 1, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 1, size);
EXPECT_EQ(kWidth * 1, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 1, &size,
+ kWidth, kHeight, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 2, size);
EXPECT_EQ(kWidth * 2, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES, 1,
- &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES, 1,
+ &size, &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 4, size);
EXPECT_EQ(kWidth * 4, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RGB_INTEGER, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 3, size);
+ EXPECT_EQ(kWidth * 3, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RG, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 2, size);
+ EXPECT_EQ(kWidth * 2, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RG_INTEGER, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 2, size);
+ EXPECT_EQ(kWidth * 2, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RED, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 1, size);
+ EXPECT_EQ(kWidth * 1, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RED_INTEGER, GL_UNSIGNED_BYTE, 1,
+ &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 1, size);
+ EXPECT_EQ(kWidth * 1, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
}
TEST_F(GLES2UtilTest, ComputeImageDataSizeTypes) {
@@ -152,35 +182,59 @@ TEST_F(GLES2UtilTest, ComputeImageDataSizeTypes) {
uint32_t unpadded_row_size;
uint32_t padded_row_size;
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_BYTE, 1, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 4, size);
EXPECT_EQ(kWidth * 4, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 1, &size,
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 2, size);
EXPECT_EQ(kWidth * 2, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 1, &size,
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 2, size);
EXPECT_EQ(kWidth * 2, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 1, &size,
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 2, size);
EXPECT_EQ(kWidth * 2, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 1, &size,
+ kWidth, kHeight, 1, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 1, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 4, size);
+ EXPECT_EQ(kWidth * 4, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, 1, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 4, size);
+ EXPECT_EQ(kWidth * 4, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_INT_10F_11F_11F_REV, 1, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 4, size);
+ EXPECT_EQ(kWidth * 4, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_RGBA, GL_UNSIGNED_INT_5_9_9_9_REV, 1, &size,
&unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 4, size);
EXPECT_EQ(kWidth * 4, padded_row_size);
EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, 1, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
+ 1, &size, &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * 4, size);
+ EXPECT_EQ(kWidth * 4, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
}
TEST_F(GLES2UtilTest, ComputeImageDataSizesUnpackAlignment) {
@@ -190,34 +244,70 @@ TEST_F(GLES2UtilTest, ComputeImageDataSizesUnpackAlignment) {
uint32_t unpadded_row_size;
uint32_t padded_row_size;
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 1, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, 1, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ(kWidth * kHeight * 3, size);
EXPECT_EQ(kWidth * 3, unpadded_row_size);
EXPECT_EQ(kWidth * 3, padded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 2, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, 2, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ((kWidth * 3 + 1) * (kHeight - 1) +
kWidth * 3, size);
EXPECT_EQ(kWidth * 3, unpadded_row_size);
EXPECT_EQ(kWidth * 3 + 1, padded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 4, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, 4, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ((kWidth * 3 + 3) * (kHeight - 1) +
kWidth * 3, size);
EXPECT_EQ(kWidth * 3, unpadded_row_size);
EXPECT_EQ(kWidth * 3 + 3, padded_row_size);
EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
- kWidth, kHeight, GL_RGB, GL_UNSIGNED_BYTE, 8, &size, &unpadded_row_size,
- &padded_row_size));
+ kWidth, kHeight, 1, GL_RGB, GL_UNSIGNED_BYTE, 8, &size,
+ &unpadded_row_size, &padded_row_size));
EXPECT_EQ((kWidth * 3 + 7) * (kHeight - 1) +
kWidth * 3, size);
EXPECT_EQ(kWidth * 3, unpadded_row_size);
EXPECT_EQ(kWidth * 3 + 7, padded_row_size);
}
+TEST_F(GLES2UtilTest, ComputeImageDataSizeDepth) {
+ const uint32_t kWidth = 19;
+ const uint32_t kHeight = 12;
+ const uint32_t kDepth = 3;
+ uint32_t size;
+ uint32_t unpadded_row_size;
+ uint32_t padded_row_size;
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, 1, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ(kWidth * kHeight * kDepth * 3, size);
+ EXPECT_EQ(kWidth * 3, padded_row_size);
+ EXPECT_EQ(padded_row_size, unpadded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, 2, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ((kWidth * 3 + 1) * (kHeight * kDepth - 1) +
+ kWidth * 3, size);
+ EXPECT_EQ(kWidth * 3, unpadded_row_size);
+ EXPECT_EQ(kWidth * 3 + 1, padded_row_size);
+ EXPECT_TRUE(GLES2Util::ComputeImageDataSizes(
+ kWidth, kHeight, kDepth, GL_RGB, GL_UNSIGNED_BYTE, 4, &size,
+ &unpadded_row_size, &padded_row_size));
+ EXPECT_EQ((kWidth * 3 + 3) * (kHeight * kDepth - 1) +
+ kWidth * 3, size);
+ EXPECT_EQ(kWidth * 3, unpadded_row_size);
+ 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, RenderbufferBytesPerPixel) {
EXPECT_EQ(1u, GLES2Util::RenderbufferBytesPerPixel(GL_STENCIL_INDEX8));
EXPECT_EQ(2u, GLES2Util::RenderbufferBytesPerPixel(GL_RGBA4));
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | gpu/command_buffer/service/context_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698