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

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

Issue 1498033003: Implement SamplerManager in the command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unnessecary state initialization 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_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 7746969eda8e5a140783886eadca2602dab863f7..dcc7160d928260b08b628ad3f248a591a62277d6 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -17,6 +17,7 @@
#include "gpu/command_buffer/service/program_manager.h"
#include "gpu/command_buffer/service/query_manager.h"
#include "gpu/command_buffer/service/renderbuffer_manager.h"
+#include "gpu/command_buffer/service/sampler_manager.h"
#include "gpu/command_buffer/service/shader_manager.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "gpu/command_buffer/service/texture_manager.h"
@@ -134,8 +135,8 @@ 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);
+ Sampler* GetSampler(GLuint client_id) {
+ return group_->sampler_manager()->GetSampler(client_id);
}
bool GetTransformFeedbackServiceId(
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h ('k') | gpu/command_buffer/service/sampler_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698