diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 17:41:11 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-23 17:41:11 +0000 |
| commit | a82c934d19ea09511ed6ffc86ef312826ea0569b (patch) | |
| tree | 3110c0ea8574572e28cf5842961e3de7e59ccf8f /cc/output/gl_renderer.h | |
| parent | 9fc281d193c6942ce94860c81d70a67f3353ed30 (diff) | |
| download | chromium_src-a82c934d19ea09511ed6ffc86ef312826ea0569b.zip chromium_src-a82c934d19ea09511ed6ffc86ef312826ea0569b.tar.gz chromium_src-a82c934d19ea09511ed6ffc86ef312826ea0569b.tar.bz2 | |
Use the correct fragment-shader for non-premultiplied program.
There were also a few bugs in the pixel test.
I have modified the pixel test parameters which should have
caught these typos and bugs in the first place.
Review URL: https://chromiumcodereview.appspot.com/19732004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/gl_renderer.h')
| -rw-r--r-- | cc/output/gl_renderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h index c6ad8b1..6638993 100644 --- a/cc/output/gl_renderer.h +++ b/cc/output/gl_renderer.h @@ -262,7 +262,7 @@ class CC_EXPORT GLRenderer : public DirectRenderer { FragmentShaderTexBackgroundVaryingAlpha> TextureBackgroundProgram; typedef ProgramBinding<VertexShaderPosTexTransform, - FragmentShaderTexBackgroundVaryingAlpha> + FragmentShaderTexBackgroundPremultiplyAlpha> NonPremultipliedTextureBackgroundProgram; typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexRectVaryingAlpha> |