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

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

Issue 1498033003: Implement SamplerManager in the command buffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more tweak from zmo@'s feedback 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_1_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
index 49cf5db84cb2ffd284762b423f38a68c64594d91..60ccfdd7d1ca8dd55fd1e83cbce97d7961751851 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h
@@ -182,6 +182,21 @@ TEST_P(GLES2DecoderTest1, BindSamplerValidArgs) {
EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
}
+TEST_P(GLES2DecoderTest1, BindSamplerValidArgsNewId) {
+ EXPECT_CALL(*gl_, BindSampler(1, kNewServiceId));
+ EXPECT_CALL(*gl_, GenSamplers(1, _))
+ .WillOnce(SetArgumentPointee<1>(kNewServiceId));
+ SpecializedSetup<cmds::BindSampler, 0>(true);
+ cmds::BindSampler cmd;
+ cmd.Init(1, kNewClientId);
+ decoder_->set_unsafe_es3_apis_enabled(true);
+ EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
+ EXPECT_EQ(GL_NO_ERROR, GetGLError());
+ EXPECT_TRUE(GetSampler(kNewClientId) != NULL);
+ decoder_->set_unsafe_es3_apis_enabled(false);
+ EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
+}
+
TEST_P(GLES2DecoderTest1, BindTextureValidArgs) {
EXPECT_CALL(*gl_, BindTexture(GL_TEXTURE_2D, kServiceTextureId));
SpecializedSetup<cmds::BindTexture, 0>(true);
@@ -562,10 +577,7 @@ TEST_P(GLES2DecoderTest1, DeleteSamplersImmediateValidArgs) {
EXPECT_EQ(error::kNoError,
ExecuteImmediateCmd(cmd, sizeof(client_sampler_id_)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
- EXPECT_FALSE(GetSamplerServiceId(client_sampler_id_, NULL));
- decoder_->set_unsafe_es3_apis_enabled(false);
- EXPECT_EQ(error::kUnknownCommand,
- ExecuteImmediateCmd(cmd, sizeof(client_sampler_id_)));
+ EXPECT_TRUE(GetSampler(client_sampler_id_) == NULL);
}
TEST_P(GLES2DecoderTest1, DeleteSamplersImmediateInvalidArgs) {
@@ -955,11 +967,7 @@ TEST_P(GLES2DecoderTest1, GenSamplersImmediateValidArgs) {
cmd->Init(1, &temp);
EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(*cmd, sizeof(temp)));
EXPECT_EQ(GL_NO_ERROR, GetGLError());
- GLuint service_id;
- EXPECT_TRUE(GetSamplerServiceId(kNewClientId, &service_id));
- EXPECT_EQ(kNewServiceId, service_id);
- decoder_->set_unsafe_es3_apis_enabled(false);
- EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(*cmd, sizeof(temp)));
+ EXPECT_TRUE(GetSampler(kNewClientId) != NULL);
}
TEST_P(GLES2DecoderTest1, GenSamplersImmediateInvalidArgs) {

Powered by Google App Engine
This is Rietveld 408576698