Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2825a7da authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 07ccf5ad: remove unused YUV formats 

Merge commit '07ccf5ad7edfeeebb79208ad3e8a52917fe038a8' into gingerbread-plus-aosp

* commit '07ccf5ad7edfeeebb79208ad3e8a52917fe038a8':
  remove unused YUV formats
parents c7683219 3f3a74a5

libs/surfaceflinger/TextureManager.cpp

+0 −15
Original line number Diff line number Diff line
@@ -102,19 +102,6 @@ status_t TextureManager::initTexture(Image* pImage, int32_t format) 


bool TextureManager::isSupportedYuvFormat(int format)

{

    // TODO: how to we know which YUV formats are supported by the GPU?



    // Adreno 200 supports these

    // YUVY_adreno

    // UYVY_adreno

    // NV21_adreno

    // YV12_adreno

    // Adreno 205 adds

    // NV12_adreno_tiled

    // NV21_adreno_tiled



    // for now pretend we support them all, failure will happen when

    // we try to use them.

    return isYuvFormat(format);

}
@@ -129,9 +116,7 @@ bool TextureManager::isYuvFormat(int format) 
    case HAL_PIXEL_FORMAT_UYVY:

    case HAL_PIXEL_FORMAT_NV12:

    case HAL_PIXEL_FORMAT_NV61:

    case HAL_PIXEL_FORMAT_YV12:

    case HAL_PIXEL_FORMAT_NV12_ADRENO_TILED:

    case HAL_PIXEL_FORMAT_NV21_ADRENO_TILED:

        return true;

    }

    return false;

libs/ui/PixelFormat.cpp

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ status_t getPixelFormatInfo(PixelFormat format, PixelFormatInfo* info) 
    case HAL_PIXEL_FORMAT_YCbCr_420_SP:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP:

    case HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED:

    case HAL_PIXEL_FORMAT_YCrCb_420_SP_TILED:

    case HAL_PIXEL_FORMAT_YCbCr_420_P:

        info->bitsPerPixel = 12;

     done: