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

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

Issue 788123002: Add sampler related ES3 APIs to command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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_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 459f1e0ec35845698703bb152da96584316958de..0d62c559540e0e1738cb8422511f642ae3d39e36 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -131,6 +131,10 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
return decoder_->GetQueryManager()->GetQuery(client_id);
}
+ bool GetSamplerServiceId(GLuint client_id, GLuint* service_id) const {
+ return group_->GetSamplerServiceId(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) {
@@ -427,7 +431,8 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
static const GLuint kServiceRenderbufferId = 303;
static const GLuint kServiceTextureId = 304;
static const GLuint kServiceProgramId = 305;
- static const GLuint kServiceShaderId = 306;
+ static const GLuint kServiceSamplerId = 306;
+ static const GLuint kServiceShaderId = 307;
static const GLuint kServiceElementBufferId = 308;
static const GLuint kServiceQueryId = 309;
static const GLuint kServiceVertexArrayId = 310;
@@ -520,6 +525,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
GLuint client_framebuffer_id_;
GLuint client_program_id_;
GLuint client_renderbuffer_id_;
+ GLuint client_sampler_id_;
GLuint client_shader_id_;
GLuint client_texture_id_;
GLuint client_element_buffer_id_;

Powered by Google App Engine
This is Rietveld 408576698