summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-09-20 16:27:41 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-09-20 16:27:41 -0700
commita8703cae33eb97af0777321181203613782186b3 (patch)
treee4380a2f08e752699d3fc13a823799cd71956c54
parent2bed0484fa3b4cac5cad82dc69affc5c49113fc4 (diff)
downloadexternal_webkit-a8703cae33eb97af0777321181203613782186b3.zip
external_webkit-a8703cae33eb97af0777321181203613782186b3.tar.gz
external_webkit-a8703cae33eb97af0777321181203613782186b3.tar.bz2
Actually update the texture filter.
bug:5347539 Change-Id: Ic70f9a3d3d780ddf8c60bf51ee94e0b36f56c22e
-rw-r--r--Source/WebCore/platform/graphics/android/ShaderProgram.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
index 3f265fc..857623a 100644
--- a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
@@ -314,8 +314,8 @@ void ShaderProgram::drawQuadInternal(SkRect& geometry,
glActiveTexture(GL_TEXTURE0);
glUniform1i(texSampler, 0);
glBindTexture(textureTarget, textureId);
- glTexParameteri(textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(textureTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(textureTarget, GL_TEXTURE_MIN_FILTER, texFilter);
+ glTexParameteri(textureTarget, GL_TEXTURE_MAG_FILTER, texFilter);
glTexParameteri(textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);