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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://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
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index fa144a710b5201d9d17ce1cfebf0ec8dec6fd856..3159483cf90c6477709c5417f998b18786bb25b0 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -142,6 +142,10 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
return group_->GetTransformFeedbackServiceId(client_id, service_id);
}
+ bool GetSyncServiceId(GLuint client_id, GLsync* service_id) const {
+ return group_->GetSyncServiceId(client_id, service_id);
+ }
+
// This name doesn't match the underlying function, but doing it this way
// prevents the need to special-case the unit test generation
VertexAttribManager* GetVertexArrayInfo(GLuint client_id) {
@@ -164,8 +168,13 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
void DoCreateProgram(GLuint client_id, GLuint service_id);
void DoCreateShader(GLenum shader_type, GLuint client_id, GLuint service_id);
+ void DoFenceSync(GLuint client_id, GLuint service_id);
void SetBucketAsCString(uint32 bucket_id, const char* str);
+ // If we want a valid bucket, just set |count_in_header| as |count|,
+ // and set |str_end| as 0.
+ void SetBucketAsCStrings(uint32 bucket_id, GLsizei count, const char** str,
+ GLsizei count_in_header, char str_end);
void set_memory_tracker(MemoryTracker* memory_tracker) {
memory_tracker_ = memory_tracker;
@@ -444,6 +453,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
static const GLuint kServiceQueryId = 309;
static const GLuint kServiceVertexArrayId = 310;
static const GLuint kServiceTransformFeedbackId = 311;
+ static const GLuint kServiceSyncId = 312;
static const int32 kSharedMemoryId = 401;
static const size_t kSharedBufferSize = 2048;
@@ -543,6 +553,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
GLuint client_vertexarray_id_;
GLuint client_valuebuffer_id_;
GLuint client_transformfeedback_id_;
+ GLuint client_sync_id_;
uint32 shared_memory_id_;
uint32 shared_memory_offset_;

Powered by Google App Engine
This is Rietveld 408576698