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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc

Issue 2435803004: Initialize buffers before allowing access to them. (Closed)
Patch Set: win failure Created 4 years, 2 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
« gpu/command_buffer/service/buffer_manager.h ('K') | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/command_buffer/service/indexed_buffer_binding_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc
index 6885c00f85a43e60e948b57ae36c310e47abe6df..04f785d98d3b32aa5a424a7275ef976897d0fcc5 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_buffers.cc
@@ -68,7 +68,7 @@ TEST_P(GLES3DecoderTest, BindBufferRangeValidArgsNewId) {
EXPECT_TRUE(GetBuffer(kNewClientId) != NULL);
}
-TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferReadSucceeds) {
+TEST_P(GLES3DecoderTest, MapBufferRangeUnmapBufferReadSucceeds) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -100,11 +100,6 @@ TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferReadSucceeds) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(false);
- *result = 0;
- EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
- EXPECT_EQ(0u, *result);
- decoder_->set_unsafe_es3_apis_enabled(true);
*result = 0;
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
int8_t* mem = reinterpret_cast<int8_t*>(&result[1]);
@@ -119,16 +114,13 @@ TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferReadSucceeds) {
UnmapBuffer cmd;
cmd.Init(kTarget);
- decoder_->set_unsafe_es3_apis_enabled(false);
- EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
-TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferWriteSucceeds) {
+TEST_P(GLES3DecoderTest, MapBufferRangeUnmapBufferWriteSucceeds) {
const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -175,11 +167,6 @@ TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferWriteSucceeds) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(false);
- *result = 0;
- EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
- EXPECT_EQ(0u, *result);
- decoder_->set_unsafe_es3_apis_enabled(true);
*result = 0;
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(1u, *result);
@@ -198,9 +185,6 @@ TEST_P(GLES2DecoderTest, MapBufferRangeUnmapBufferWriteSucceeds) {
UnmapBuffer cmd;
cmd.Init(kTarget);
- decoder_->set_unsafe_es3_apis_enabled(false);
- EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
// Verify the GPU mem and shadow data are both updated
@@ -329,7 +313,7 @@ TEST_P(GLES3DecoderTest, FlushMappedBufferRangeSucceeds) {
EXPECT_EQ(GL_NO_ERROR, GetGLError());
}
-TEST_P(GLES2DecoderTest, MapBufferRangeNotInitFails) {
+TEST_P(GLES3DecoderTest, MapBufferRangeNotInitFails) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -347,11 +331,10 @@ TEST_P(GLES2DecoderTest, MapBufferRangeNotInitFails) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderTest, MapBufferRangeWriteInvalidateRangeSucceeds) {
+TEST_P(GLES3DecoderTest, MapBufferRangeWriteInvalidateRangeSucceeds) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -384,11 +367,10 @@ TEST_P(GLES2DecoderTest, MapBufferRangeWriteInvalidateRangeSucceeds) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderTest, MapBufferRangeWriteInvalidateBufferSucceeds) {
+TEST_P(GLES3DecoderTest, MapBufferRangeWriteInvalidateBufferSucceeds) {
// Test INVALIDATE_BUFFER_BIT is mapped to INVALIDATE_RANGE_BIT.
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
@@ -424,11 +406,10 @@ TEST_P(GLES2DecoderTest, MapBufferRangeWriteInvalidateBufferSucceeds) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderTest, MapBufferRangeWriteUnsynchronizedBit) {
+TEST_P(GLES3DecoderTest, MapBufferRangeWriteUnsynchronizedBit) {
// Test UNSYNCHRONIZED_BIT is filtered out.
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
@@ -462,12 +443,11 @@ TEST_P(GLES2DecoderTest, MapBufferRangeWriteUnsynchronizedBit) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(0, memcmp(&data[0], mem, kSize));
}
-TEST_P(GLES2DecoderTest, MapBufferRangeWithError) {
+TEST_P(GLES3DecoderTest, MapBufferRangeWithError) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -491,7 +471,6 @@ TEST_P(GLES2DecoderTest, MapBufferRangeWithError) {
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess, data_shm_id, data_shm_offset,
result_shm_id, result_shm_offset);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
memset(&data[0], 72, kSize);
// Mem is untouched.
@@ -500,7 +479,7 @@ TEST_P(GLES2DecoderTest, MapBufferRangeWithError) {
EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
}
-TEST_P(GLES2DecoderTest, MapBufferRangeBadSharedMemoryFails) {
+TEST_P(GLES3DecoderTest, MapBufferRangeBadSharedMemoryFails) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -521,7 +500,6 @@ TEST_P(GLES2DecoderTest, MapBufferRangeBadSharedMemoryFails) {
uint32_t data_shm_id = kSharedMemoryId;
uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(*result);
- decoder_->set_unsafe_es3_apis_enabled(true);
MapBufferRange cmd;
cmd.Init(kTarget, kOffset, kSize, kAccess,
kInvalidSharedMemoryId, data_shm_offset,
@@ -541,29 +519,27 @@ TEST_P(GLES2DecoderTest, MapBufferRangeBadSharedMemoryFails) {
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderTest, UnmapBufferWriteNotMappedFails) {
+TEST_P(GLES3DecoderTest, UnmapBufferWriteNotMappedFails) {
const GLenum kTarget = GL_ARRAY_BUFFER;
DoBindBuffer(kTarget, client_buffer_id_, kServiceBufferId);
UnmapBuffer cmd;
cmd.Init(kTarget);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
}
-TEST_P(GLES2DecoderTest, UnmapBufferWriteNoBoundBufferFails) {
+TEST_P(GLES3DecoderTest, UnmapBufferWriteNoBoundBufferFails) {
const GLenum kTarget = GL_ARRAY_BUFFER;
UnmapBuffer cmd;
cmd.Init(kTarget);
- decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
}
-TEST_P(GLES2DecoderTest, BufferDataDestroysDataStore) {
+TEST_P(GLES3DecoderTest, BufferDataDestroysDataStore) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -581,8 +557,6 @@ TEST_P(GLES2DecoderTest, BufferDataDestroysDataStore) {
std::vector<int8_t> data(kSize);
- decoder_->set_unsafe_es3_apis_enabled(true);
-
{ // MapBufferRange succeeds
EXPECT_CALL(*gl_,
MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
@@ -613,7 +587,7 @@ TEST_P(GLES2DecoderTest, BufferDataDestroysDataStore) {
}
}
-TEST_P(GLES2DecoderTest, DeleteBuffersDestroysDataStore) {
+TEST_P(GLES3DecoderTest, DeleteBuffersDestroysDataStore) {
const GLenum kTarget = GL_ARRAY_BUFFER;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -631,8 +605,6 @@ TEST_P(GLES2DecoderTest, DeleteBuffersDestroysDataStore) {
std::vector<int8_t> data(kSize);
- decoder_->set_unsafe_es3_apis_enabled(true);
-
{ // MapBufferRange succeeds
EXPECT_CALL(*gl_,
MapBufferRange(kTarget, kOffset, kSize, kFilteredAccess))
@@ -663,7 +635,7 @@ TEST_P(GLES2DecoderTest, DeleteBuffersDestroysDataStore) {
}
}
-TEST_P(GLES2DecoderTest, MapUnmapBufferInvalidTarget) {
+TEST_P(GLES3DecoderTest, MapUnmapBufferInvalidTarget) {
const GLenum kTarget = GL_TEXTURE_2D;
const GLintptr kOffset = 10;
const GLsizeiptr kSize = 64;
@@ -675,8 +647,6 @@ TEST_P(GLES2DecoderTest, MapUnmapBufferInvalidTarget) {
// uint32_t is Result for both MapBufferRange and UnmapBuffer commands.
uint32_t data_shm_offset = kSharedMemoryOffset + sizeof(uint32_t);
- decoder_->set_unsafe_es3_apis_enabled(true);
-
typedef MapBufferRange::Result Result;
Result* result = GetSharedMemoryAs<Result*>();
« gpu/command_buffer/service/buffer_manager.h ('K') | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/command_buffer/service/indexed_buffer_binding_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698