diff options
author | Mathias Agopian <mathias@google.com> | 2012-07-25 18:56:13 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2012-07-25 21:13:10 -0700 |
commit | c666cae2d5995097ec49a87e375e2afdd92802b7 (patch) | |
tree | 235abd54f4c3c6ed2c6b59bbade55a6459f13ed8 /include/private | |
parent | 028508cad5ef63ef9fbd42c14e76658e4fd9ebf2 (diff) | |
download | frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.zip frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.tar.gz frameworks_native-c666cae2d5995097ec49a87e375e2afdd92802b7.tar.bz2 |
get rid of the shared-memory control block
Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/gui/ComposerService.h | 4 | ||||
-rw-r--r-- | include/private/gui/SharedBufferStack.h | 59 |
2 files changed, 0 insertions, 63 deletions
diff --git a/include/private/gui/ComposerService.h b/include/private/gui/ComposerService.h index d04491a..c2761b8 100644 --- a/include/private/gui/ComposerService.h +++ b/include/private/gui/ComposerService.h @@ -30,7 +30,6 @@ namespace android { class IMemoryHeap; class ISurfaceComposer; -class surface_flinger_cblk_t; // --------------------------------------------------------------------------- @@ -38,13 +37,10 @@ class ComposerService : public Singleton<ComposerService> { // these are constants sp<ISurfaceComposer> mComposerService; - sp<IMemoryHeap> mServerCblkMemory; - surface_flinger_cblk_t volatile* mServerCblk; ComposerService(); friend class Singleton<ComposerService>; public: static sp<ISurfaceComposer> getComposerService(); - static surface_flinger_cblk_t const volatile * getControlBlock(); }; // --------------------------------------------------------------------------- diff --git a/include/private/gui/SharedBufferStack.h b/include/private/gui/SharedBufferStack.h deleted file mode 100644 index 0da03d1..0000000 --- a/include/private/gui/SharedBufferStack.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_SF_SHARED_BUFFER_STACK_H -#define ANDROID_SF_SHARED_BUFFER_STACK_H - -#include <stdint.h> -#include <sys/types.h> - -#include <utils/Debug.h> - -namespace android { -// --------------------------------------------------------------------------- - -#define NUM_DISPLAY_MAX 4 - -struct display_cblk_t -{ - uint16_t w; - uint16_t h; - uint8_t format; - uint8_t orientation; - uint8_t reserved[2]; - float fps; - float density; - float xdpi; - float ydpi; - uint32_t pad[2]; -}; - -struct surface_flinger_cblk_t // 4KB max -{ - uint8_t connected; - uint8_t reserved[3]; - uint32_t pad[7]; - display_cblk_t displays[NUM_DISPLAY_MAX]; -}; - -// --------------------------------------------------------------------------- - -COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096) - -// --------------------------------------------------------------------------- -}; // namespace android - -#endif /* ANDROID_SF_SHARED_BUFFER_STACK_H */ |