summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-08-07 17:14:38 -0700
committerChris Craik <ccraik@google.com>2012-08-07 17:14:38 -0700
commitba9571c9e16df15462aebaa6b0479aadc930b814 (patch)
treed4ee4cdb3eb8abe03c7bb0ddd306588e16065944 /Source/WebCore/platform/graphics/android/rendering
parent74d16a7661fcde10787bc62b4c62e202c9cc2495 (diff)
downloadexternal_webkit-ba9571c9e16df15462aebaa6b0479aadc930b814.zip
external_webkit-ba9571c9e16df15462aebaa6b0479aadc930b814.tar.gz
external_webkit-ba9571c9e16df15462aebaa6b0479aadc930b814.tar.bz2
Reset cached opacity on shader swap
bug:6947623 Multiple shaders share the opacity variable, so reset the cache when swapping programs. Change-Id: I752575d6089077aa8034c171c5c016e5e4e80606
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/ShaderProgram.cpp1
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);