diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 21:22:42 +0000 |
| commit | c753e25a8b4366c44134a8c21b9ed3392bf48608 (patch) | |
| tree | f378c8a762caccf60856a1670ae33dfd638b9453 /cc/shader.cc | |
| parent | 503160f80568f024fa712e280bb1a4e1e6ca1ec3 (diff) | |
| download | chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.zip chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.gz chromium_src-c753e25a8b4366c44134a8c21b9ed3392bf48608.tar.bz2 | |
Revert "cc: Rename cc classes and members to match filenames"
This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/shader.cc')
| -rw-r--r-- | cc/shader.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/shader.cc b/cc/shader.cc index 57ebde4..7eaee7b 100644 --- a/cc/shader.cc +++ b/cc/shader.cc @@ -759,7 +759,7 @@ void FragmentShaderYUVVideo::init(WebGraphicsContext3D* context, unsigned progra "u_texture", "v_texture", "alpha", - "matrix", + "cc_matrix", "yuv_adj", }; int locations[6]; @@ -789,14 +789,14 @@ std::string FragmentShaderYUVVideo::getShaderString() const uniform sampler2D v_texture; uniform float alpha; uniform vec3 yuv_adj; - uniform mat3 matrix; + uniform mat3 cc_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 = matrix * yuv; + vec3 rgb = cc_matrix * yuv; gl_FragColor = vec4(rgb, float(1)) * alpha; } ); |