diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-10 12:23:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 12:23:49 -0700 |
| commit | 623ee2a569bddc34f044c475867d4b6d3eeb1153 (patch) | |
| tree | 2f126650c47c21e447f10b825d1df30d8dd1e2f3 /libs/hwui/OpenGLRenderer.cpp | |
| parent | f5e9018b8043e9a61b51283af6c4aa4738ef6068 (diff) | |
| parent | 61c8c9c5b2006d18e9310b6521c65b36ffe75ce4 (diff) | |
| download | frameworks_base-623ee2a569bddc34f044c475867d4b6d3eeb1153.zip frameworks_base-623ee2a569bddc34f044c475867d4b6d3eeb1153.tar.gz frameworks_base-623ee2a569bddc34f044c475867d4b6d3eeb1153.tar.bz2 | |
Merge "Fix tons of bugs and add new text rendering support."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 5d30b1a..ff00ba6 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -435,6 +435,7 @@ void OpenGLRenderer::drawBitmap(SkBitmap* bitmap, float left, float top, const S return; } + glActiveTexture(GL_TEXTURE0); const Texture* texture = mTextureCache.get(bitmap); if (!texture) return; const AutoTexture autoCleanup(texture); @@ -451,6 +452,7 @@ void OpenGLRenderer::drawBitmap(SkBitmap* bitmap, const SkMatrix* matrix, const return; } + glActiveTexture(GL_TEXTURE0); const Texture* texture = mTextureCache.get(bitmap); if (!texture) return; const AutoTexture autoCleanup(texture); @@ -466,6 +468,7 @@ void OpenGLRenderer::drawBitmap(SkBitmap* bitmap, return; } + glActiveTexture(GL_TEXTURE0); const Texture* texture = mTextureCache.get(bitmap); if (!texture) return; const AutoTexture autoCleanup(texture); @@ -491,6 +494,7 @@ void OpenGLRenderer::drawPatch(SkBitmap* bitmap, Res_png_9patch* patch, return; } + glActiveTexture(GL_TEXTURE0); const Texture* texture = mTextureCache.get(bitmap); if (!texture) return; const AutoTexture autoCleanup(texture); |