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

Unified Diff: cc/output/shader.h

Issue 2675813002: Make LUTs independent of YUV in cc shaders (Closed)
Patch Set: compile fix 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
Index: cc/output/shader.h
diff --git a/cc/output/shader.h b/cc/output/shader.h
index c1e4d242d12d485bf7b6e5c1b03d78a246a4e041..f079932b84bba0642cdf4dbc206217480340dabf 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -130,14 +130,6 @@ enum YUVAlphaTextureMode {
YUV_HAS_ALPHA_TEXTURE,
};
-enum ColorConversionMode {
ccameron 2017/02/02 23:38:07 Please leave this as an enum instead of a boolean
- // No color conversion is performed.
- COLOR_CONVERSION_MODE_NONE,
- // Conversion is done directly from YUV to output RGB space, via a 3D texture
- // represented as a 2D texture.
- COLOR_CONVERSION_MODE_LUT_FROM_YUV,
-};
-
// TODO(ccameron): Merge this with BlendMode.
enum FragColorMode {
FRAG_COLOR_MODE_DEFAULT,
@@ -283,8 +275,6 @@ class FragmentShader {
YUVAlphaTextureMode yuv_alpha_texture_mode_ = YUV_ALPHA_TEXTURE_MODE_NA;
UVTextureMode uv_texture_mode_ = UV_TEXTURE_MODE_UV;
- ColorConversionMode color_conversion_mode_ = COLOR_CONVERSION_MODE_NONE;
-
// YUV uniform locations.
int y_texture_location_ = -1;
int u_texture_location_ = -1;
@@ -294,13 +284,12 @@ class FragmentShader {
int ya_clamp_rect_location_ = -1;
int uv_clamp_rect_location_ = -1;
- // Analytic YUV to RGB convertion.
- int yuv_matrix_location_ = -1;
- int yuv_adj_location_ = -1;
ccameron 2017/02/02 23:38:07 Please continue to use these uniforms instead of c
-
- // LUT YUV to color-converted RGB.
+ // LUT
+ bool has_lut_ = false;
int lut_texture_location_ = -1;
int lut_size_location_ = -1;
+
+ bool has_resource_offset_ = false;
int resource_multiplier_location_ = -1;
int resource_offset_location_ = -1;
« no previous file with comments | « cc/output/program_binding.cc ('k') | cc/output/shader.cc » ('j') | cc/output/shader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698