summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-03-01 20:08:07 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-01 20:08:07 -0800
commit5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8 (patch)
tree7244e5a590df555a0e5ffb3fcf209e36dc76ef57 /include
parent2a21ff5f51f74d98fcdee96dff1da658da8da84b (diff)
parent196855ed4eb4681c4d3504438706caf6b505c9d6 (diff)
downloadframeworks_av-5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8.zip
frameworks_av-5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8.tar.gz
frameworks_av-5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8.tar.bz2
Merge "Add support for up to 32 buffers per Surface"
Diffstat (limited to 'include')
-rw-r--r--include/private/surfaceflinger/SharedBufferStack.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h
index eb599b5..717f837 100644
--- a/include/private/surfaceflinger/SharedBufferStack.h
+++ b/include/private/surfaceflinger/SharedBufferStack.h
@@ -65,7 +65,7 @@ public:
// When changing these values, the COMPILE_TIME_ASSERT at the end of this
// file need to be updated.
static const unsigned int NUM_LAYERS_MAX = 31;
- static const unsigned int NUM_BUFFER_MAX = 16;
+ static const unsigned int NUM_BUFFER_MAX = 32;
static const unsigned int NUM_BUFFER_MIN = 2;
static const unsigned int NUM_DISPLAY_MAX = 4;
@@ -123,7 +123,7 @@ public:
// ----------------------------------------------------------------------------
-// 32 KB max
+// 64 KB max
class SharedClient
{
public:
@@ -394,7 +394,7 @@ struct surface_flinger_cblk_t // 4KB max
// ---------------------------------------------------------------------------
-COMPILE_TIME_ASSERT(sizeof(SharedClient) <= 32768)
+COMPILE_TIME_ASSERT(sizeof(SharedClient) <= 65536)
COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096)
// ---------------------------------------------------------------------------