diff options
| author | Chris Craik <ccraik@google.com> | 2015-05-27 19:22:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-27 19:22:44 +0000 |
| commit | 1e6d566c5f8500e3639a8f8ceebf0226c07efc13 (patch) | |
| tree | fa7b1732dad9f013f02a5a8f2a86a63cdd0ce655 /libs | |
| parent | 06c88b60efd12d3e81c7a9c53d8b995e23d04c5a (diff) | |
| parent | 5f1356c80a3f0daf436aa4250dcfa8fce3029828 (diff) | |
| download | frameworks_base-1e6d566c5f8500e3639a8f8ceebf0226c07efc13.zip frameworks_base-1e6d566c5f8500e3639a8f8ceebf0226c07efc13.tar.gz frameworks_base-1e6d566c5f8500e3639a8f8ceebf0226c07efc13.tar.bz2 | |
Merge "Fix GL texture binding for TextureViews" into mnc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderstate/RenderState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index d7c8316..df12e63 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -266,10 +266,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); |