diff options
author | Mathias Agopian <mathias@google.com> | 2010-08-19 13:37:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-19 13:37:35 -0700 |
commit | 545eab8ae80b070177cc442931eadc8cd980de26 (patch) | |
tree | 50a767dd9641eca11fe85290993654495247fb6e | |
parent | 0014474569b8bb237f00fa692ab173678bff619e (diff) | |
parent | e509328efcbb05856e5e9c0310394911ee3243dc (diff) | |
download | frameworks_base-545eab8ae80b070177cc442931eadc8cd980de26.zip frameworks_base-545eab8ae80b070177cc442931eadc8cd980de26.tar.gz frameworks_base-545eab8ae80b070177cc442931eadc8cd980de26.tar.bz2 |
Merge "remove unused pixel format" into gingerbread
-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 edf1aed..ee186c8 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 0f448e0..76f6159 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; } |