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

Unified Diff: cc/output/gl_renderer_unittest.cc

Issue 2628183002: The great shader refactor: Add YUV support to the uber shader (Closed)
Patch Set: Rebase Created 3 years, 11 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
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/program_binding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 20a5e36de1a035e5d2af91329bc1d1cfe690bf18..dc5a6aaac89a88c4242055fff3c1dc7c7819de4f 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -186,11 +186,17 @@ class GLRendererShaderPixelTest : public GLRendererPixelTest {
ProgramKey::Tile(precision, sampler, NO_AA, DO_SWIZZLE, true)));
// Iterate over alpha plane, nv12, and color_lut parameters.
+ UVTextureMode uv_modes[2] = {UV_TEXTURE_MODE_UV, UV_TEXTURE_MODE_U_V};
+ YUVAlphaTextureMode a_modes[2] = {YUV_NO_ALPHA_TEXTURE,
+ YUV_HAS_ALPHA_TEXTURE};
+ ColorConversionMode c_modes[2] = {
+ COLOR_CONVERSION_MODE_NONE,
+ COLOR_CONVERSION_MODE_2D_LUT_AS_3D_FROM_YUV};
for (int j = 0; j < 2; j++) {
for (int k = 0; k < 2; k++) {
for (int l = 0; l < 2; l++) {
- const Program* program = renderer()->GetProgram(
- ProgramKey::YUVVideo(precision, sampler, j, k, l));
+ const Program* program = renderer()->GetProgram(ProgramKey::YUVVideo(
+ precision, sampler, a_modes[j], uv_modes[k], c_modes[l]));
EXPECT_PROGRAM_VALID(program);
}
}
« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/program_binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698