diff options
| author | Chris Craik <ccraik@google.com> | 2012-08-07 17:22:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-07 17:22:59 -0700 |
| commit | ebebc5e52683c447aef50606d0418d8de629d60a (patch) | |
| tree | 2ee51d6bf38fd4ad2470c6f8000d8ca664e21af1 | |
| parent | a78491ed6e0d7534ad725fbb620aaf8ea6a07a58 (diff) | |
| parent | ba9571c9e16df15462aebaa6b0479aadc930b814 (diff) | |
| download | external_webkit-ebebc5e52683c447aef50606d0418d8de629d60a.zip external_webkit-ebebc5e52683c447aef50606d0418d8de629d60a.tar.gz external_webkit-ebebc5e52683c447aef50606d0418d8de629d60a.tar.bz2 | |
Merge "Reset cached opacity on shader swap" into jb-mr1-dev
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp b/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp index 9e13ca1..b59b6e2 100644 --- a/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp @@ -728,6 +728,7 @@ void ShaderProgram::drawQuadInternal(ShaderType type, const GLfloat* matrix, glVertexAttribPointer(m_handleArray[type].positionHandle, 2, GL_FLOAT, GL_FALSE, 0, 0); m_cachedProgramType = type; + m_cachedOpacity = -1; // reset cache for variable shared by multiple programs } glUniformMatrix4fv(m_handleArray[type].projMtxHandle, 1, GL_FALSE, matrix); |