Render: Add AI88/IA88 surface foramt support for subpicture

Signed off by: Li,Xiaowei A <xiaowei.a.li@intel.com>
(cherry picked from commit 6a641d0feda6ded2abcd907c4ceb5a45f134990d)

Conflicts:

	src/i965_drv_video.h

diff --git a/src/i965_defines.h b/src/i965_defines.h
index 5988949..144505d 100644 (file)
--- a/src/i965_defines.h
+++ b/src/i965_defines.h
@@ -486,6 +486,8 @@
 #define I965_SURFACEFORMAT_R8G8_USCALED                   0x11D
 #define I965_SURFACEFORMAT_R16_SSCALED                    0x11E
 #define I965_SURFACEFORMAT_R16_USCALED                    0x11F
+#define I965_SURFACEFORMAT_P8A8_UNORM                     0x122 
+#define I965_SURFACEFORMAT_A8P8_UNORM                     0x123
 #define I965_SURFACEFORMAT_R8_UNORM                       0x140 
 #define I965_SURFACEFORMAT_R8_SNORM                       0x141 
 #define I965_SURFACEFORMAT_R8_SINT                        0x142 

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 6a5c919..4433775 100644 (file)
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -144,7 +144,13 @@ i965_subpic_formats_map[I965_MAX_SUBPIC_FORMATS + 1] = {
     { I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_A4P4_UNORM,
       { VA_FOURCC('A','I','4','4'), VA_MSB_FIRST, 8, },
       VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD },
-    { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_B8G8R8A8_UNORM,
+    { I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_P8A8_UNORM,
+      { VA_FOURCC('I','A','8','8'), VA_MSB_FIRST, 16, },
+      VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD },
+    { I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_A8P8_UNORM,
+      { VA_FOURCC('A','I','8','8'), VA_MSB_FIRST, 16, },
+      VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD },
+     { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_B8G8R8A8_UNORM,
       { VA_FOURCC('B','G','R','A'), VA_LSB_FIRST, 32,
         32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 },
       VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD },

diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h
index 87f8548..15eb189 100644 (file)
--- a/src/i965_drv_video.h
+++ b/src/i965_drv_video.h
@@ -41,7 +41,7 @@
 #define I965_MAX_ENTRYPOINTS                    5
 #define I965_MAX_CONFIG_ATTRIBUTES              10
 #define I965_MAX_IMAGE_FORMATS                  3
-#define I965_MAX_SUBPIC_FORMATS                 4
+#define I965_MAX_SUBPIC_FORMATS                 6
 
 #define INTEL_STR_DRIVER_VENDOR                 "Intel"
 #define INTEL_STR_DRIVER_NAME                   "i965"