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

Unified Diff: cc/output/gl_renderer_unittest.cc

Issue 555133002: [WIP Experiment] Implement mix-blend-mode in GLRenderer using shaders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile issue on mac Created 6 years, 3 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: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 4befaf51e28e19eca6deacb42e8025f25c51fedb..a3b4005848d1fa7e8b074b9cdc915be2a940ff0a 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -203,56 +203,58 @@ class GLRendererShaderTest : public GLRendererTest {
}
void TestRenderPassProgram(TexCoordPrecision precision) {
- EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_[precision]);
- EXPECT_EQ(renderer_->render_pass_program_[precision].program(),
+ EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_program_[0][precision].program(),
enne (OOO) 2014/09/24 22:07:56 Why 0? Shouldn't you test that every combination o
renderer_->program_shadow_);
}
void TestRenderPassColorMatrixProgram(TexCoordPrecision precision) {
EXPECT_PROGRAM_VALID(
- &renderer_->render_pass_color_matrix_program_[precision]);
- EXPECT_EQ(renderer_->render_pass_color_matrix_program_[precision].program(),
- renderer_->program_shadow_);
+ &renderer_->render_pass_color_matrix_program_[0][precision]);
+ EXPECT_EQ(
+ renderer_->render_pass_color_matrix_program_[0][precision].program(),
+ renderer_->program_shadow_);
}
void TestRenderPassMaskProgram(TexCoordPrecision precision) {
- EXPECT_PROGRAM_VALID(&renderer_->render_pass_mask_program_[precision]);
- EXPECT_EQ(renderer_->render_pass_mask_program_[precision].program(),
+ EXPECT_PROGRAM_VALID(&renderer_->render_pass_mask_program_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_mask_program_[0][precision].program(),
renderer_->program_shadow_);
}
void TestRenderPassMaskColorMatrixProgram(TexCoordPrecision precision) {
EXPECT_PROGRAM_VALID(
- &renderer_->render_pass_mask_color_matrix_program_[precision]);
- EXPECT_EQ(
- renderer_->render_pass_mask_color_matrix_program_[precision].program(),
- renderer_->program_shadow_);
+ &renderer_->render_pass_mask_color_matrix_program_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_mask_color_matrix_program_[0][precision]
+ .program(),
+ renderer_->program_shadow_);
}
void TestRenderPassProgramAA(TexCoordPrecision precision) {
- EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_aa_[precision]);
- EXPECT_EQ(renderer_->render_pass_program_aa_[precision].program(),
+ EXPECT_PROGRAM_VALID(&renderer_->render_pass_program_aa_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_program_aa_[0][precision].program(),
renderer_->program_shadow_);
}
void TestRenderPassColorMatrixProgramAA(TexCoordPrecision precision) {
EXPECT_PROGRAM_VALID(
- &renderer_->render_pass_color_matrix_program_aa_[precision]);
+ &renderer_->render_pass_color_matrix_program_aa_[0][precision]);
EXPECT_EQ(
- renderer_->render_pass_color_matrix_program_aa_[precision].program(),
+ renderer_->render_pass_color_matrix_program_aa_[0][precision].program(),
renderer_->program_shadow_);
}
void TestRenderPassMaskProgramAA(TexCoordPrecision precision) {
- EXPECT_PROGRAM_VALID(&renderer_->render_pass_mask_program_aa_[precision]);
- EXPECT_EQ(renderer_->render_pass_mask_program_aa_[precision].program(),
+ EXPECT_PROGRAM_VALID(
+ &renderer_->render_pass_mask_program_aa_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_mask_program_aa_[0][precision].program(),
renderer_->program_shadow_);
}
void TestRenderPassMaskColorMatrixProgramAA(TexCoordPrecision precision) {
EXPECT_PROGRAM_VALID(
- &renderer_->render_pass_mask_color_matrix_program_aa_[precision]);
- EXPECT_EQ(renderer_->render_pass_mask_color_matrix_program_aa_[precision]
+ &renderer_->render_pass_mask_color_matrix_program_aa_[0][precision]);
+ EXPECT_EQ(renderer_->render_pass_mask_color_matrix_program_aa_[0][precision]
.program(),
renderer_->program_shadow_);
}

Powered by Google App Engine
This is Rietveld 408576698