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

Unified Diff: cc/shader.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/shader.cc
diff --git a/cc/shader.cc b/cc/shader.cc
index b936dd96c49a5c7b3a8ae52fca0763c94ae4cce2..196d7ebf8a54f043c2e5730b8249bd7c7e23c98d 100644
--- a/cc/shader.cc
+++ b/cc/shader.cc
@@ -758,7 +758,7 @@ void FragmentShaderYUVVideo::init(WebGraphicsContext3D* context, unsigned progra
"u_texture",
"v_texture",
"alpha",
- "cc_matrix",
+ "matrix",
"yuv_adj",
};
int locations[6];
@@ -788,14 +788,14 @@ std::string FragmentShaderYUVVideo::getShaderString() const
uniform sampler2D v_texture;
uniform float alpha;
uniform vec3 yuv_adj;
- uniform mat3 cc_matrix;
+ uniform mat3 matrix;
void main()
{
float y_raw = texture2D(y_texture, y_texCoord).x;
float u_unsigned = texture2D(u_texture, uv_texCoord).x;
float v_unsigned = texture2D(v_texture, uv_texCoord).x;
vec3 yuv = vec3(y_raw, u_unsigned, v_unsigned) + yuv_adj;
- vec3 rgb = cc_matrix * yuv;
+ vec3 rgb = matrix * yuv;
gl_FragColor = vec4(rgb, float(1)) * alpha;
}
);
« cc/active_animation.h ('K') | « cc/shader.h ('k') | cc/shared_quad_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698