diff options
| -rw-r--r-- | include/gui/SurfaceComposerClient.h | 2 | ||||
| -rw-r--r-- | include/gui/SurfaceControl.h | 2 | ||||
| -rw-r--r-- | include/private/gui/LayerState.h | 2 | ||||
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 8 | ||||
| -rw-r--r-- | libs/gui/SurfaceControl.cpp | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index 830216079f..807d85b90c 100644 --- a/include/gui/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -148,7 +148,7 @@ public: status_t setTransparentRegionHint(const sp<IBinder>& id, const Region& transparent); status_t setLayer(const sp<IBinder>& id, int32_t layer); status_t setAlpha(const sp<IBinder>& id, float alpha=1.0f); - status_t setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, float dsdy, float dtdy); + status_t setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, float dtdy, float dsdy); status_t setPosition(const sp<IBinder>& id, float x, float y); status_t setSize(const sp<IBinder>& id, uint32_t w, uint32_t h); status_t setCrop(const sp<IBinder>& id, const Rect& crop); diff --git a/include/gui/SurfaceControl.h b/include/gui/SurfaceControl.h index 54c8fa9dd2..99208b2e16 100644 --- a/include/gui/SurfaceControl.h +++ b/include/gui/SurfaceControl.h @@ -69,7 +69,7 @@ public: status_t setFlags(uint32_t flags, uint32_t mask); status_t setTransparentRegionHint(const Region& transparent); status_t setAlpha(float alpha=1.0f); - status_t setMatrix(float dsdx, float dtdx, float dsdy, float dtdy); + status_t setMatrix(float dsdx, float dtdx, float dtdy, float dsdy); status_t setCrop(const Rect& crop); status_t setFinalCrop(const Rect& crop); diff --git a/include/private/gui/LayerState.h b/include/private/gui/LayerState.h index 2a1801b4dd..0bcff465d0 100644 --- a/include/private/gui/LayerState.h +++ b/include/private/gui/LayerState.h @@ -77,8 +77,8 @@ struct layer_state_t { struct matrix22_t { float dsdx{0}; float dtdx{0}; - float dsdy{0}; float dtdy{0}; + float dsdy{0}; }; sp<IBinder> surface; uint32_t what; diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index ae81c8fbd1..9e81a78e10 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -157,7 +157,7 @@ public: status_t setAlpha(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id, float alpha); status_t setMatrix(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id, - float dsdx, float dtdx, float dsdy, float dtdy); + float dsdx, float dtdx, float dtdy, float dsdy); status_t setOrientation(int orientation); status_t setCrop(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id, const Rect& crop); @@ -392,7 +392,7 @@ status_t Composer::setLayerStack(const sp<SurfaceComposerClient>& client, status_t Composer::setMatrix(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id, float dsdx, float dtdx, - float dsdy, float dtdy) { + float dtdy, float dsdy) { Mutex::Autolock _l(mLock); layer_state_t* s = getLayerStateLocked(client, id); if (!s) @@ -768,8 +768,8 @@ status_t SurfaceComposerClient::setLayerStack(const sp<IBinder>& id, uint32_t la } status_t SurfaceComposerClient::setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, - float dsdy, float dtdy) { - return getComposer().setMatrix(this, id, dsdx, dtdx, dsdy, dtdy); + float dtdy, float dsdy) { + return getComposer().setMatrix(this, id, dsdx, dtdx, dtdy, dsdy); } status_t SurfaceComposerClient::deferTransactionUntil(const sp<IBinder>& id, diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp index 0362216258..070a3c85d7 100644 --- a/libs/gui/SurfaceControl.cpp +++ b/libs/gui/SurfaceControl.cpp @@ -147,10 +147,10 @@ status_t SurfaceControl::setAlpha(float alpha) { if (err < 0) return err; return mClient->setAlpha(mHandle, alpha); } -status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dsdy, float dtdy) { +status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dtdy, float dsdy) { status_t err = validate(); if (err < 0) return err; - return mClient->setMatrix(mHandle, dsdx, dtdx, dsdy, dtdy); + return mClient->setMatrix(mHandle, dsdx, dtdx, dtdy, dsdy); } status_t SurfaceControl::setCrop(const Rect& crop) { status_t err = validate(); diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 2f83c0e946..f45f2a1458 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -1733,7 +1733,7 @@ bool Layer::setAlpha(uint8_t alpha) { bool Layer::setMatrix(const layer_state_t::matrix22_t& matrix) { mCurrentState.sequence++; mCurrentState.requested.transform.set( - matrix.dsdx, matrix.dsdy, matrix.dtdx, matrix.dtdy); + matrix.dsdx, matrix.dtdy, matrix.dtdx, matrix.dsdy); mCurrentState.modified = true; setTransactionFlags(eTransactionNeeded); return true; |