diff options
| author | Mathias Agopian <mathias@google.com> | 2011-07-18 16:15:08 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-07-19 13:05:12 -0700 |
| commit | 933389f75814bb62e8153528f9cff2cb329b77df (patch) | |
| tree | 355a83e45a91cf145e434280ad27cf0aaf7cdadf /services/surfaceflinger/Layer.h | |
| parent | 7734ebfe47f42f980c1b44c1f284a91d8ad1d6c7 (diff) | |
| download | frameworks_native-933389f75814bb62e8153528f9cff2cb329b77df.zip frameworks_native-933389f75814bb62e8153528f9cff2cb329b77df.tar.gz frameworks_native-933389f75814bb62e8153528f9cff2cb329b77df.tar.bz2 | |
use SurfaceTexture new scaling mode in SF
SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size
Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
Diffstat (limited to 'services/surfaceflinger/Layer.h')
| -rw-r--r-- | services/surfaceflinger/Layer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index e3fc13d..ddfc666 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -59,7 +59,6 @@ public: status_t setBuffers(uint32_t w, uint32_t h, PixelFormat format, uint32_t flags=0); - // Set this Layer's buffers size bool isFixedSize() const; // LayerBase interface @@ -88,7 +87,6 @@ private: void onFrameQueued(); virtual sp<ISurface> createSurface(); uint32_t getEffectiveUsage(uint32_t usage) const; - void setFixedSize(bool fixedSize); bool isCropped() const; static bool getOpacityForFormat(uint32_t format); @@ -106,6 +104,7 @@ private: GLfloat mTextureMatrix[16]; Rect mCurrentCrop; uint32_t mCurrentTransform; + uint32_t mCurrentScalingMode; bool mCurrentOpacity; // constants @@ -124,7 +123,6 @@ private: // binder thread, transaction thread mutable Mutex mLock; - bool mFixedSize; }; // --------------------------------------------------------------------------- |