diff options
| author | Romain Guy <romainguy@google.com> | 2010-07-29 18:48:04 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2010-07-29 18:48:04 -0700 |
| commit | ae5575b3421c8fbe590ab046d7d5f2b36ecfd821 (patch) | |
| tree | 2e4cfe7b83c81492a577428e0f8b7cb33faaa551 /libs/hwui/OpenGLRenderer.h | |
| parent | 889f8d1403761d5668115ced6cbb3f767cfe966d (diff) | |
| download | frameworks_base-ae5575b3421c8fbe590ab046d7d5f2b36ecfd821.zip frameworks_base-ae5575b3421c8fbe590ab046d7d5f2b36ecfd821.tar.gz frameworks_base-ae5575b3421c8fbe590ab046d7d5f2b36ecfd821.tar.bz2 | |
Fix gradients rendering and destructor crashes.
This changes binds all textures to GL_TEXTURE0, this will have
to be changed when combining shader capabilities.
Change-Id: I02df4f5ba41e9b01ffa52fd7c26b41477c7ed18f
Diffstat (limited to 'libs/hwui/OpenGLRenderer.h')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 5e5c021..937ff08 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -315,7 +315,7 @@ private: // Number of saved states int mSaveCount; // Base state - Snapshot mFirstSnapshot; + sp<Snapshot> mFirstSnapshot; // Current state sp<Snapshot> mSnapshot; @@ -325,10 +325,6 @@ private: // Used to draw textured quads TextureVertex mMeshVertices[4]; - // Current texture state - GLuint mLastTexture[REQUIRED_TEXTURE_UNITS_COUNT]; - GLint mMaxTextureUnits; - // Last known blend state bool mBlend; GLenum mLastSrcMode; |
