diff options
author | Mathias Agopian <mathias@google.com> | 2009-06-23 20:06:46 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-06-23 20:06:46 -0700 |
commit | c6603951d45fc9b0d1776fec9444b6f31af92840 (patch) | |
tree | 862d116c32f53ea2f206caa7aefc509087c44a38 /libs/surfaceflinger/LayerBase.h | |
parent | f6c2a1ae60a190951b1c9e93f64f62a000cb51fd (diff) | |
download | frameworks_base-c6603951d45fc9b0d1776fec9444b6f31af92840.zip frameworks_base-c6603951d45fc9b0d1776fec9444b6f31af92840.tar.gz frameworks_base-c6603951d45fc9b0d1776fec9444b6f31af92840.tar.bz2 |
fix a bug causing push-buffer surfaces' identity to be garbage, which resulted in some attributes (size/pos) to fail to be set
Diffstat (limited to 'libs/surfaceflinger/LayerBase.h')
-rw-r--r-- | libs/surfaceflinger/LayerBase.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index dad3d3d..6fb1d1c 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -277,9 +277,6 @@ protected: // don't change, don't need a lock bool mPremultipliedAlpha; - // only read - const uint32_t mIdentity; - // atomic volatile int32_t mInvalidate; @@ -290,7 +287,6 @@ protected: private: LayerBase(const LayerBase& rhs); void validateTexture(GLint textureName) const; - static int32_t sIdentity; }; @@ -360,6 +356,9 @@ private: int32_t mIndex; mutable Mutex mLock; mutable wp<Surface> mClientSurface; + // only read + const uint32_t mIdentity; + static int32_t sIdentity; }; // --------------------------------------------------------------------------- |