diff options
| author | Romain Guy <romainguy@google.com> | 2010-10-13 15:17:00 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2010-10-13 17:24:41 -0700 |
| commit | 99bcdc52dcb365ed7d8cfa13540fb33fbcbbac9d (patch) | |
| tree | 6aa73d73948d851ea9b61c36e74a275c4092f5ad | |
| parent | bbf68c6ad2cc3dd338f93779d60c5821e730a263 (diff) | |
| download | frameworks_base-99bcdc52dcb365ed7d8cfa13540fb33fbcbbac9d.zip frameworks_base-99bcdc52dcb365ed7d8cfa13540fb33fbcbbac9d.tar.gz frameworks_base-99bcdc52dcb365ed7d8cfa13540fb33fbcbbac9d.tar.bz2 | |
Return identity matrix when rendering in an FBO.
Change-Id: I57438e745b30c8cfe16c269f3cafcd719049d705
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 5 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 92875b1..d81760d 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -585,7 +585,10 @@ void OpenGLRenderer::setMatrix(SkMatrix* matrix) { } const float* OpenGLRenderer::getMatrix() const { - return &mSnapshot->transform->data[0]; + if (mSnapshot->fbo != 0) { + return &mSnapshot->transform->data[0]; + } + return &mIdentity.data[0]; } void OpenGLRenderer::getMatrix(SkMatrix* matrix) { diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index f8828e2..423614b 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -432,6 +432,9 @@ private: // Misc GLint mMaxTextureSize; + // Indentity matrix + const mat4 mIdentity; + friend class DisplayListRenderer; }; // class OpenGLRenderer |