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

Unified Diff: gpu/command_buffer/tests/gl_fence_sync_unittest.cc

Issue 1399173002: Reland: Added SyncToken command buffer trait to help with IPC messages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Read/Write SyncToken variables separately. Created 5 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
« no previous file with comments | « gpu/command_buffer/service/mailbox_manager_unittest.cc ('k') | gpu/command_buffer_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/tests/gl_fence_sync_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_fence_sync_unittest.cc b/gpu/command_buffer/tests/gl_fence_sync_unittest.cc
index ad21f345a870078e90dc59b20b75ba280883ee3c..2d764765e966a7f5339ecc63006c8adb9083c14e 100644
--- a/gpu/command_buffer/tests/gl_fence_sync_unittest.cc
+++ b/gpu/command_buffer/tests/gl_fence_sync_unittest.cc
@@ -7,6 +7,7 @@
#include <GLES2/gl2extchromium.h>
#include "base/memory/scoped_ptr.h"
+#include "gpu/command_buffer/common/sync_token.h"
#include "gpu/command_buffer/service/sync_point_manager.h"
#include "gpu/command_buffer/tests/gl_manager.h"
#include "gpu/command_buffer/tests/gl_test_utils.h"
@@ -44,9 +45,9 @@ TEST_F(GLFenceSyncTest, SimpleReleaseWait) {
gl1_.MakeCurrent();
const GLuint64 fence_sync = glInsertFenceSyncCHROMIUM();
- GLbyte sync_token[GL_SYNC_TOKEN_SIZE_CHROMIUM];
+ SyncToken sync_token;
glFlush();
- glGenSyncTokenCHROMIUM(fence_sync, sync_token);
+ glGenSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
ASSERT_TRUE(GL_NO_ERROR == glGetError());
// Make sure it is actually released.
@@ -56,7 +57,7 @@ TEST_F(GLFenceSyncTest, SimpleReleaseWait) {
EXPECT_TRUE(gl1_client_state->IsFenceSyncReleased(fence_sync));
gl2_.MakeCurrent();
- glWaitSyncTokenCHROMIUM(sync_token);
+ glWaitSyncTokenCHROMIUM(sync_token.GetConstData());
glFinish();
// gl2 should not have released anything.
« no previous file with comments | « gpu/command_buffer/service/mailbox_manager_unittest.cc ('k') | gpu/command_buffer_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698