diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-20 16:55:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-20 16:55:46 -0700 |
| commit | 9bb3d7b14004fcacb8d331e482208d5b883803ef (patch) | |
| tree | 1c49b844301fc948eefe0f02761f03f14deb3b20 /Source | |
| parent | 573d2754446fc611151ef424b4b87a525bcd006d (diff) | |
| parent | a8703cae33eb97af0777321181203613782186b3 (diff) | |
| download | external_webkit-9bb3d7b14004fcacb8d331e482208d5b883803ef.zip external_webkit-9bb3d7b14004fcacb8d331e482208d5b883803ef.tar.gz external_webkit-9bb3d7b14004fcacb8d331e482208d5b883803ef.tar.bz2 | |
Merge "Actually update the texture filter."
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/ShaderProgram.cpp | 4 |
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); |