diff options
| author | 2016-01-22 09:31:28 -0800 | |
|---|---|---|
| committer | 2016-01-22 09:31:28 -0800 | |
| commit | bd41ded59090e8cdf598e0c65693f1cf0885bbea (patch) | |
| tree | 9c1bc90693054ea68c0146c2d9dec042a137eec9 /libs/hwui/Texture.cpp | |
| parent | 09a02f1c34cc8c8952805e0088723f999ea2aa6f (diff) | |
Fix accidental activateTexture(0)
Bug: 26584230
activateTexture(0) was accidentally refactored into
Texture::upload. Only OffscreenBuffer intended for the
texture unit to change
Change-Id: I5dbfc3eab8843733084ce1ce38a0a946abf0e05b
Diffstat (limited to 'libs/hwui/Texture.cpp')
| -rw-r--r-- | libs/hwui/Texture.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/hwui/Texture.cpp b/libs/hwui/Texture.cpp index 92de89491127..0f02f4c0aba7 100644 --- a/libs/hwui/Texture.cpp +++ b/libs/hwui/Texture.cpp @@ -95,7 +95,6 @@ bool Texture::updateSize(uint32_t width, uint32_t height, GLint format) { void Texture::upload(GLint internalformat, uint32_t width, uint32_t height, GLenum format, GLenum type, const void* pixels) { GL_CHECKPOINT(); - mCaches.textureState().activateTexture(0); bool needsAlloc = updateSize(width, height, internalformat); if (!mId) { glGenTextures(1, &mId); |