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

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

Issue 1528163002: Added 64 bit number support in the build gles2 command buffer script. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modifyed glClientWaitSync and glWaitSync to use GLuint64 in command buffer Created 5 years 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
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index c09c6589e60fccdcff4df19f9d36266e5b3f7f48..699b31d1d7eaa38edfa50213533b3876f47a6b66 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -330,9 +330,7 @@ TEST_P(GLES3DecoderTest, ClientWaitSyncValid) {
typedef cmds::ClientWaitSync::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
cmds::ClientWaitSync cmd;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(0, &v32_0, &v32_1);
- cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
shared_memory_id_, shared_memory_offset_);
EXPECT_CALL(*gl_,
ClientWaitSync(reinterpret_cast<GLsync>(kServiceSyncId),
@@ -353,9 +351,7 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncNonZeroTimeoutValid) {
Result* result = static_cast<Result*>(shared_memory_address_);
cmds::ClientWaitSync cmd;
const GLuint64 kTimeout = 0xABCDEF0123456789;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(kTimeout, &v32_0, &v32_1);
- cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, kTimeout,
shared_memory_id_, shared_memory_offset_);
EXPECT_CALL(*gl_,
ClientWaitSync(reinterpret_cast<GLsync>(kServiceSyncId),
@@ -375,10 +371,8 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncInvalidSyncFails) {
typedef cmds::ClientWaitSync::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
cmds::ClientWaitSync cmd;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(0, &v32_0, &v32_1);
decoder_->set_unsafe_es3_apis_enabled(true);
- cmd.Init(kInvalidClientId, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(kInvalidClientId, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
shared_memory_id_, shared_memory_offset_);
*result = GL_WAIT_FAILED;
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ -390,10 +384,8 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncResultNotInitFails) {
typedef cmds::ClientWaitSync::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
cmds::ClientWaitSync cmd;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(0, &v32_0, &v32_1);
decoder_->set_unsafe_es3_apis_enabled(true);
- cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
shared_memory_id_, shared_memory_offset_);
*result = 1; // Any value other than GL_WAIT_FAILED
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
@@ -403,16 +395,14 @@ TEST_P(GLES2DecoderTest, ClientWaitSyncBadSharedMemoryFails) {
typedef cmds::ClientWaitSync::Result Result;
Result* result = static_cast<Result*>(shared_memory_address_);
cmds::ClientWaitSync cmd;
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(0, &v32_0, &v32_1);
decoder_->set_unsafe_es3_apis_enabled(true);
*result = GL_WAIT_FAILED;
- cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
kInvalidSharedMemoryId, shared_memory_offset_);
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
*result = GL_WAIT_FAILED;
- cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, v32_0, v32_1,
+ cmd.Init(client_sync_id_, GL_SYNC_FLUSH_COMMANDS_BIT, 0,
shared_memory_id_, kInvalidSharedMemoryOffset);
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
}
@@ -424,10 +414,8 @@ TEST_P(GLES2DecoderTest, WaitSyncValidArgs) {
.Times(1)
.RetiresOnSaturation();
- uint32_t v32_0 = 0, v32_1 = 0;
- GLES2Util::MapUint64ToTwoUint32(kTimeout, &v32_0, &v32_1);
cmds::WaitSync cmd;
- cmd.Init(client_sync_id_, 0, v32_0, v32_1);
+ cmd.Init(client_sync_id_, 0, kTimeout);
decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
EXPECT_EQ(GL_NO_ERROR, GetGLError());

Powered by Google App Engine
This is Rietveld 408576698