diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-09 20:48:09 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2010-08-10 12:22:01 -0700 |
| commit | 61c8c9c5b2006d18e9310b6521c65b36ffe75ce4 (patch) | |
| tree | f2a792387a3177a2e7a25290ec48bd79c62ef3e6 /libs/hwui/OpenGLRenderer.cpp | |
| parent | 8cc82c6f4802937309dce6cba310e31358cdf6bf (diff) | |
| download | frameworks_base-61c8c9c5b2006d18e9310b6521c65b36ffe75ce4.zip frameworks_base-61c8c9c5b2006d18e9310b6521c65b36ffe75ce4.tar.gz frameworks_base-61c8c9c5b2006d18e9310b6521c65b36ffe75ce4.tar.bz2 | |
Fix tons of bugs and add new text rendering support.
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
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); |