Revert "Remove unused formats."

This reverts commit c9cbdb3f42f9d4cfdd9a529ecb9d556a09bbd51c.

diff --git a/cros_gralloc/i915_private_android_types.h b/cros_gralloc/i915_private_android_types.h
index 44d8241..a361628 100644 (file)
--- a/cros_gralloc/i915_private_android_types.h
+++ b/cros_gralloc/i915_private_android_types.h
@@ -17,10 +17,50 @@
 #endif
 
 enum { HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL = 0x100,
+       HAL_PIXEL_FORMAT_NV12_LINEAR_INTEL = 0x101,
+       HAL_PIXEL_FORMAT_YCrCb_422_H_INTEL = 0x102,
+       HAL_PIXEL_FORMAT_NV12_LINEAR_PACKED_INTEL = 0x103,
+       HAL_PIXEL_FORMAT_YCbCr_422_H_INTEL = 0x104,
+       HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL = 0x105,
+       HAL_PIXEL_FORMAT_RGBA_5551_INTEL = 0x106,
+       HAL_PIXEL_FORMAT_RGBA_4444_INTEL = 0x107,
+       HAL_PIXEL_FORMAT_GENERIC_8BIT_INTEL = 0x108,
+       HAL_PIXEL_FORMAT_YCbCr_411_INTEL = 0x109,
+       HAL_PIXEL_FORMAT_YCbCr_420_H_INTEL = 0x10A,
+       HAL_PIXEL_FORMAT_YCbCr_422_V_INTEL = 0x10B,
+       HAL_PIXEL_FORMAT_YCbCr_444_INTEL = 0x10C,
+       HAL_PIXEL_FORMAT_RGBP_INTEL = 0x10D,
+       HAL_PIXEL_FORMAT_BGRP_INTEL = 0x10E,
+       HAL_PIXEL_FORMAT_NV12_LINEAR_CAMERA_INTEL = 0x10F,
        HAL_PIXEL_FORMAT_P010_INTEL = 0x110,
+       HAL_PIXEL_FORMAT_Z16_INTEL = 0x111,
+       HAL_PIXEL_FORMAT_UVMAP64_INTEL = 0x112,
        HAL_PIXEL_FORMAT_A2R10G10B10_INTEL = 0x113,
+       HAL_PIXEL_FORMAT_A2B10G10R10_INTEL = 0x114,
+       HAL_PIXEL_FORMAT_YCrCb_NORMAL_INTEL = 0x115,
+       HAL_PIXEL_FORMAT_YCrCb_SWAPUVY_INTEL = 0x116,
+       HAL_PIXEL_FORMAT_YCrCb_SWAPUV_INTEL = 0x117,
+       HAL_PIXEL_FORMAT_YCrCb_SWAPY_INTEL = 0x118,
        HAL_PIXEL_FORMAT_X2R10G10B10_INTEL = 0x119,
+       HAL_PIXEL_FORMAT_X2B10G10R10_INTEL = 0x11A,
+       HAL_PIXEL_FORMAT_P016_INTEL = 0x11C,
+       HAL_PIXEL_FORMAT_Y210_INTEL = 0x11D,
+       HAL_PIXEL_FORMAT_Y216_INTEL = 0x11E,
+       HAL_PIXEL_FORMAT_Y410_INTEL = 0x11F,
+       HAL_PIXEL_FORMAT_Y416_INTEL = 0x120,
+       HAL_PIXEL_FORMAT_Y8I_INTEL = 0x121,
+       HAL_PIXEL_FORMAT_Y12I_INTEL = 0x122,
+       HAL_PIXEL_FORMAT_YUYV_INTEL = HAL_PIXEL_FORMAT_YCrCb_NORMAL_INTEL,
+       HAL_PIXEL_FORMAT_YUY2_INTEL = HAL_PIXEL_FORMAT_YCrCb_NORMAL_INTEL,
+       HAL_PIXEL_FORMAT_VYUY_INTEL = HAL_PIXEL_FORMAT_YCrCb_SWAPUVY_INTEL,
+       HAL_PIXEL_FORMAT_YVYU_INTEL = HAL_PIXEL_FORMAT_YCrCb_SWAPUV_INTEL,
+       HAL_PIXEL_FORMAT_UYVY_INTEL = HAL_PIXEL_FORMAT_YCrCb_SWAPY_INTEL,
+       HAL_PIXEL_FORMAT_NV12_TILED_INTEL = HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL,
+       HAL_PIXEL_FORMAT_NV12_INTEL = HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL,
+       HAL_PIXEL_FORMAT_INTEL_NV12 = HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL,
        HAL_PIXEL_FORMAT_NV12 = 0x10F,
+       HAL_PIXEL_FORMAT_YUV420PackedSemiPlanar_INTEL = 0x7FA00E00,
+       HAL_PIXEL_FORMAT_YUV420PackedSemiPlanar_Tiled_INTEL = 0x7FA00F00,
 };
 
 #ifdef USE_GRALLOC1