Merge "Add support for up to 32 buffers per Surface"

This commit is contained in:
Mathias Agopian 2011-03-01 20:08:07 -08:00 committed by Android (Google) Code Review
commit 17290c5583

View File

@ -65,7 +65,7 @@ public:
// When changing these values, the COMPILE_TIME_ASSERT at the end of this // When changing these values, the COMPILE_TIME_ASSERT at the end of this
// file need to be updated. // file need to be updated.
static const unsigned int NUM_LAYERS_MAX = 31; 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_BUFFER_MIN = 2;
static const unsigned int NUM_DISPLAY_MAX = 4; static const unsigned int NUM_DISPLAY_MAX = 4;
@ -123,7 +123,7 @@ public:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// 32 KB max // 64 KB max
class SharedClient class SharedClient
{ {
public: 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) COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------