diff options
| author | 2016-12-17 01:50:48 +0000 | |
|---|---|---|
| committer | 2016-12-17 01:50:52 +0000 | |
| commit | c4c286f30a60ef9ebfc959ea4869d87ceeb831dc (patch) | |
| tree | d74dc58761098af25c2e16314468fb8ae7126975 | |
| parent | 8018f22c2ceb97536828787d0a49c320cb9a18e5 (diff) | |
| parent | d3e08d4811e13aefd656e3376e7d56e2d37bb388 (diff) | |
Merge "Remove RGBX_FP16 format"
| -rw-r--r-- | include/android/native_window.h | 2 | ||||
| -rw-r--r-- | include/ui/PixelFormat.h | 1 | ||||
| -rw-r--r-- | libs/gui/CpuConsumer.cpp | 1 | ||||
| -rw-r--r-- | libs/gui/GLConsumer.cpp | 1 | ||||
| -rw-r--r-- | libs/ui/PixelFormat.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp | 1 |
6 files changed, 0 insertions, 8 deletions
diff --git a/include/android/native_window.h b/include/android/native_window.h index b017a25208..021dc42d9a 100644 --- a/include/android/native_window.h +++ b/include/android/native_window.h @@ -48,8 +48,6 @@ enum { WINDOW_FORMAT_RGB_565 = 4, /** Red: 16 bits, Green: 16 bits, Blue: 16 bits, Alpha: 16 bits. **/ WINDOW_FORMAT_RGBA_FP16 = 0x16, - /** Red: 16 bits, Green: 16 bits, Blue: 16 bits, Unused: 16 bits. **/ - WINDOW_FORMAT_RGBX_FP16 = 0x17, }; struct ANativeWindow; diff --git a/include/ui/PixelFormat.h b/include/ui/PixelFormat.h index 99c6663ded..ab7a9a37a5 100644 --- a/include/ui/PixelFormat.h +++ b/include/ui/PixelFormat.h @@ -61,7 +61,6 @@ enum { PIXEL_FORMAT_RGBA_5551 = 6, // 16-bit ARGB PIXEL_FORMAT_RGBA_4444 = 7, // 16-bit ARGB PIXEL_FORMAT_RGBA_FP16 = HAL_PIXEL_FORMAT_RGBA_FP16, // 64-bit RGBA - PIXEL_FORMAT_RGBX_FP16 = HAL_PIXEL_FORMAT_RGBX_FP16, // 64-bit RGB0 }; typedef int32_t PixelFormat; diff --git a/libs/gui/CpuConsumer.cpp b/libs/gui/CpuConsumer.cpp index 4acf618a63..a9bafef8b6 100644 --- a/libs/gui/CpuConsumer.cpp +++ b/libs/gui/CpuConsumer.cpp @@ -65,7 +65,6 @@ static bool isPossiblyYUV(PixelFormat format) { case HAL_PIXEL_FORMAT_RGBA_8888: case HAL_PIXEL_FORMAT_RGBX_8888: case HAL_PIXEL_FORMAT_RGBA_FP16: - case HAL_PIXEL_FORMAT_RGBX_FP16: case HAL_PIXEL_FORMAT_RGB_888: case HAL_PIXEL_FORMAT_RGB_565: case HAL_PIXEL_FORMAT_BGRA_8888: diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp index b919b3c84c..fea9df7f89 100644 --- a/libs/gui/GLConsumer.cpp +++ b/libs/gui/GLConsumer.cpp @@ -859,7 +859,6 @@ void GLConsumer::computeTransformMatrix(float outTransform[16], case PIXEL_FORMAT_RGBA_8888: case PIXEL_FORMAT_RGBX_8888: case PIXEL_FORMAT_RGBA_FP16: - case PIXEL_FORMAT_RGBX_FP16: case PIXEL_FORMAT_RGB_888: case PIXEL_FORMAT_RGB_565: case PIXEL_FORMAT_BGRA_8888: diff --git a/libs/ui/PixelFormat.cpp b/libs/ui/PixelFormat.cpp index 3ceb6380e5..734472d2b1 100644 --- a/libs/ui/PixelFormat.cpp +++ b/libs/ui/PixelFormat.cpp @@ -23,7 +23,6 @@ namespace android { uint32_t bytesPerPixel(PixelFormat format) { switch (format) { case PIXEL_FORMAT_RGBA_FP16: - case PIXEL_FORMAT_RGBX_FP16: return 8; case PIXEL_FORMAT_RGBA_8888: case PIXEL_FORMAT_RGBX_8888: @@ -42,7 +41,6 @@ uint32_t bytesPerPixel(PixelFormat format) { uint32_t bitsPerPixel(PixelFormat format) { switch (format) { case PIXEL_FORMAT_RGBA_FP16: - case PIXEL_FORMAT_RGBX_FP16: return 64; case PIXEL_FORMAT_RGBA_8888: case PIXEL_FORMAT_RGBX_8888: diff --git a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp index c40a58c3a3..e3afd506e1 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer_hwc1.cpp @@ -1160,7 +1160,6 @@ static String8 getFormatStr(PixelFormat format) { case PIXEL_FORMAT_RGBA_8888: return String8("RGBA_8888"); case PIXEL_FORMAT_RGBX_8888: return String8("RGBx_8888"); case PIXEL_FORMAT_RGBA_FP16: return String8("RGBA_FP16"); - case PIXEL_FORMAT_RGBX_FP16: return String8("RGBx_FP16"); case PIXEL_FORMAT_RGB_888: return String8("RGB_888"); case PIXEL_FORMAT_RGB_565: return String8("RGB_565"); case PIXEL_FORMAT_BGRA_8888: return String8("BGRA_8888"); |