diff options
| author | Romain Guy <romainguy@google.com> | 2011-01-12 15:06:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-12 15:06:18 -0800 |
| commit | b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c (patch) | |
| tree | e62078ca3e3efbf22e14c38cdd92fcf03810128e | |
| parent | 1aaae92f990bad51d503fe692def01191fda4db7 (diff) | |
| parent | c038ea358aadca082198f3effc550d33135bf426 (diff) | |
| download | frameworks_base-b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c.zip frameworks_base-b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c.tar.gz frameworks_base-b08ea03c1bbb8bfa2c44d23c50155e3f34a6968c.tar.bz2 | |
Merge "Reenable region composition pipeline for layers Bug #3341848" into honeycomb
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/Properties.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index aefefe4..9beb227 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -627,7 +627,7 @@ void OpenGLRenderer::composeLayerRegion(Layer* layer, const Rect& rect) { setupDrawDirtyRegionsDisabled(); setupDrawPureColorUniforms(); setupDrawTexture(layer->texture); - setupDrawModelViewIdentity(); + setupDrawModelViewTranslate(rect.left, rect.top, rect.right, rect.bottom); setupDrawMesh(&mesh[0].position[0], &mesh[0].texture[0]); for (size_t i = 0; i < count; i++) { diff --git a/libs/hwui/Properties.h b/libs/hwui/Properties.h index c474936..6a0d7ea 100644 --- a/libs/hwui/Properties.h +++ b/libs/hwui/Properties.h @@ -26,7 +26,7 @@ */ // If turned on, layers drawn inside FBOs are optimized with regions -#define RENDER_LAYERS_AS_REGIONS 0 +#define RENDER_LAYERS_AS_REGIONS 1 /** * Debug level for app developers. |