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

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: rebase 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_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 8d6753753dd95f60324886a29afbb70ab1dafbe4..cb49ae9b4827dfda4d9615514b0ba7d217548890 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_programs.cc
@@ -2016,27 +2016,22 @@ 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)))
- .WillOnce(Return(kLocation))
- .RetiresOnSaturation();
decoder_->set_unsafe_es3_apis_enabled(true);
EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
- EXPECT_EQ(kLocation, *result);
+ EXPECT_EQ(static_cast<GLint>(kOutputVariable1ColorName), *result);
decoder_->set_unsafe_es3_apis_enabled(false);
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