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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc

Issue 1309743005: command_buffer: Implement EXT_blend_func_extended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new-05-path-fragment-input-gen
Patch Set: ~ Created 5 years, 4 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_programs.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
index f22d26992d098cf2d9340c41e69539fdb88e25b9..5f5394337a66f28c5da5e7a803167c801bc69fe6 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
@@ -1845,17 +1845,17 @@ TEST_P(GLES2DecoderWithShaderTest, GetAttribLocationInvalidArgs) {
EXPECT_NE(error::kNoError, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderWithShaderTest, GetFragDataLocation) {
+TEST_P(GLES3DecoderWithESSL3ShaderTest, GetFragDataLocation) {
const uint32 kBucketId = 123;
const GLint kLocation = 10;
- const char* kName = "color";
typedef GetFragDataLocation::Result Result;
Result* result = GetSharedMemoryAs<Result*>();
- SetBucketAsCString(kBucketId, kName);
+ SetBucketAsCString(kBucketId, kOutputVariable1NameESSL3);
*result = -1;
GetFragDataLocation cmd;
cmd.Init(client_program_id_, kBucketId, kSharedMemoryId, kSharedMemoryOffset);
- EXPECT_CALL(*gl_, GetFragDataLocation(kServiceProgramId, StrEq(kName)))
+ EXPECT_CALL(*gl_, GetFragDataLocation(kServiceProgramId,
+ StrEq(kOutputVariable1NameESSL3)))
.WillOnce(Return(kLocation))
.RetiresOnSaturation();
decoder_->set_unsafe_es3_apis_enabled(true);
@@ -1865,7 +1865,7 @@ TEST_P(GLES2DecoderWithShaderTest, GetFragDataLocation) {
EXPECT_EQ(error::kUnknownCommand, ExecuteCmd(cmd));
}
-TEST_P(GLES2DecoderWithShaderTest, GetFragDataLocationInvalidArgs) {
+TEST_P(GLES3DecoderWithESSL3ShaderTest, GetFragDataLocationInvalidArgs) {
const uint32 kBucketId = 123;
typedef GetFragDataLocation::Result Result;
Result* result = GetSharedMemoryAs<Result*>();

Powered by Google App Engine
This is Rietveld 408576698