diff options
| author | 2010-08-19 13:39:56 -0700 | |
|---|---|---|
| committer | 2010-08-19 13:39:56 -0700 | |
| commit | a90a1e55c60604b930eecff03fe25429205ec7df (patch) | |
| tree | 72ff68f3a54d21aba08e6e73de6b4c6c189fd460 | |
| parent | d7d58be0b8c1be69bfb774f38bf6d1410d87c4ce (diff) | |
| parent | 545eab8ae80b070177cc442931eadc8cd980de26 (diff) | |
am 545eab8a: Merge "remove unused pixel format" into gingerbread
Merge commit '545eab8ae80b070177cc442931eadc8cd980de26' into gingerbread-plus-aosp
* commit '545eab8ae80b070177cc442931eadc8cd980de26':
remove unused pixel format
| -rw-r--r-- | libs/ui/PixelFormat.cpp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/TextureManager.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libs/ui/PixelFormat.cpp b/libs/ui/PixelFormat.cpp index edf1aede5913..ee186c84de9c 100644 --- a/libs/ui/PixelFormat.cpp +++ b/libs/ui/PixelFormat.cpp @@ -63,7 +63,6 @@ status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info) info->bitsPerPixel = 16; goto done; case HAL_PIXEL_FORMAT_YCrCb_420_SP: - case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED: case HAL_PIXEL_FORMAT_YV12: info->bitsPerPixel = 12; done: diff --git a/services/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp index 0f448e08cc95..76f61598b15e 100644 --- a/services/surfaceflinger/TextureManager.cpp +++ b/services/surfaceflinger/TextureManager.cpp @@ -121,7 +121,6 @@ bool TextureManager::isYuvFormat(int format) case HAL_PIXEL_FORMAT_YCbCr_422_SP: case HAL_PIXEL_FORMAT_YCrCb_420_SP: case HAL_PIXEL_FORMAT_YCbCr_422_I: - case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED: return true; } |