summaryrefslogtreecommitdiffstats
path: root/include/surfaceflinger
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-08-24 17:56:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 17:56:40 -0700
commitbce2e90ca9bc2277a4816b7996f84506df411cf9 (patch)
tree2a1902282acfebe7f68a202a4c43ffbeb0e9df6d /include/surfaceflinger
parent8d9d751a8f09a0199d1d22a3f8267eb51f919cc0 (diff)
parentbc4389edfbb5777aec1a9af7863b2ca3ade2fa64 (diff)
downloadframeworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.zip
frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.gz
frameworks_base-bce2e90ca9bc2277a4816b7996f84506df411cf9.tar.bz2
am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64' * commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64': fix [2931513] Add support for setting the orientation of an ANativeWindow
Diffstat (limited to 'include/surfaceflinger')
-rw-r--r--include/surfaceflinger/Surface.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h
index 6fdd2ae..a210880 100644
--- a/include/surfaceflinger/Surface.h
+++ b/include/surfaceflinger/Surface.h
@@ -217,6 +217,7 @@ private:
int dispatch_crop(va_list args);
int dispatch_set_buffer_count(va_list args);
int dispatch_set_buffers_geometry(va_list args);
+ int dispatch_set_buffers_transform(va_list args);
void setUsage(uint32_t reqUsage);
int connect(int api);
@@ -224,6 +225,7 @@ private:
int crop(Rect const* rect);
int setBufferCount(int bufferCount);
int setBuffersGeometry(int w, int h, int format);
+ int setBuffersTransform(int transform);
/*
* private stuff...
@@ -279,6 +281,7 @@ private:
Rect mSwapRectangle;
int mConnected;
Rect mNextBufferCrop;
+ uint32_t mNextBufferTransform;
BufferInfo mBufferInfo;
// protected by mSurfaceLock. These are also used from lock/unlock