summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-05-27 11:06:21 -0700
committerChris Craik <ccraik@google.com>2015-05-27 11:06:22 -0700
commit5f1356c80a3f0daf436aa4250dcfa8fce3029828 (patch)
tree8fb9a49f4486599bec26d53247aa5f8e77366c43 /libs
parentaa1cd25db72297f13539928e8aa45ba992f2f230 (diff)
downloadframeworks_base-5f1356c80a3f0daf436aa4250dcfa8fce3029828.zip
frameworks_base-5f1356c80a3f0daf436aa4250dcfa8fce3029828.tar.gz
frameworks_base-5f1356c80a3f0daf436aa4250dcfa8fce3029828.tar.bz2
Fix GL texture binding for TextureViews
bug:21431334 Should be explicitly passing target through, to ensure GL_EXTERNAL_OES textures are bound correctly. Change-Id: I997672ae292ea7fc016c02a59a3c7c8358ecfe0b
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/renderstate/RenderState.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp
index e54fa5a..bde91cc 100644
--- a/libs/hwui/renderstate/RenderState.cpp
+++ b/libs/hwui/renderstate/RenderState.cpp
@@ -265,10 +265,10 @@ void RenderState::render(const Glop& glop) {
mCaches->textureState().activateTexture(0);
if (texture.clamp != GL_INVALID_ENUM) {
- texture.texture->setWrap(texture.clamp, true);
+ texture.texture->setWrap(texture.clamp, true, false, texture.target);
}
if (texture.filter != GL_INVALID_ENUM) {
- texture.texture->setFilter(texture.filter, true);
+ texture.texture->setFilter(texture.filter, true, false, texture.target);
}
mCaches->textureState().bindTexture(texture.target, texture.texture->id);