diff options
| author | Chris Craik <ccraik@google.com> | 2014-02-05 13:00:24 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-02-05 13:12:04 -0800 |
| commit | 629f67709b84a6bebdecdc8a500bf83560f557d0 (patch) | |
| tree | 5f9e4ee666a8da3d5ecb01b89fdea449c49678d3 /libs/hwui/DisplayListOp.h | |
| parent | c734de9c2bcd17e5b07647002acb11afcf19aff6 (diff) | |
| download | frameworks_base-629f67709b84a6bebdecdc8a500bf83560f557d0.zip frameworks_base-629f67709b84a6bebdecdc8a500bf83560f557d0.tar.gz frameworks_base-629f67709b84a6bebdecdc8a500bf83560f557d0.tar.bz2 | |
Simplify DisplayList matrices
Somewhat unifies the ortho/perspecive paths - the property matrix
(translate/scale/rotate) is now always a Matrix4.
Change-Id: I36e4fe83d1150ee6e4be5f64f34d0fc8d6525cc6
Diffstat (limited to 'libs/hwui/DisplayListOp.h')
| -rw-r--r-- | libs/hwui/DisplayListOp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index 20bc93d..dec796a 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -465,7 +465,7 @@ public: virtual void output(int level, uint32_t logFlags) const { if (mMatrix) { - OP_LOG("SetMatrix " MATRIX_STRING, MATRIX_ARGS(mMatrix)); + OP_LOG("SetMatrix " SK_MATRIX_STRING, SK_MATRIX_ARGS(mMatrix)); } else { OP_LOGS("SetMatrix (reset)"); } @@ -487,7 +487,7 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("ConcatMatrix " MATRIX_STRING, MATRIX_ARGS(mMatrix)); + OP_LOG("ConcatMatrix " SK_MATRIX_STRING, SK_MATRIX_ARGS(mMatrix)); } virtual const char* name() { return "ConcatMatrix"; } @@ -848,7 +848,7 @@ public: } virtual void output(int level, uint32_t logFlags) const { - OP_LOG("Draw bitmap %p matrix " MATRIX_STRING, mBitmap, MATRIX_ARGS(mMatrix)); + OP_LOG("Draw bitmap %p matrix " SK_MATRIX_STRING, mBitmap, SK_MATRIX_ARGS(mMatrix)); } virtual const char* name() { return "DrawBitmapMatrix"; } |