Update some CSC kernels for packed pixels

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>

3 files changed, 25 insertions, 22 deletions

diff --git a/src/shaders/post_processing/gen8/conv_8bit_420_rgb32.g8b b/src/shaders/post_processing/gen8/conv_8bit_420_rgb32.g8b
index 2d422ad1..267203f8 100644
--- a/src/shaders/post_processing/gen8/conv_8bit_420_rgb32.g8b
+++ b/src/shaders/post_processing/gen8/conv_8bit_420_rgb32.g8b
@@ -1,27 +1,28 @@
 { 0x00600001, 0x2fd02648, 0x00000000, 0x76543210 },
 { 0x00000005, 0x2fc0124c, 0x16000004, 0x01ff01ff },
 { 0x00600001, 0x2f801208, 0x008d0fd0, 0x00000000 },
-{ 0x00000005, 0x2fc2124c, 0x16000006, 0x01ff01ff },
 { 0x00000041, 0x20a01208, 0x16000fc0, 0x00100010 },
 { 0x00600040, 0x2fa00208, 0x168d0f80, 0x00080008 },
-{ 0x00000041, 0x2f601228, 0x16000fc2, 0x00100010 },
+{ 0x00000005, 0x2fc2124c, 0x16000006, 0x01ff01ff },
 { 0x00800040, 0x2f800208, 0x028d0f80, 0x000000a0 },
+{ 0x00000041, 0x2f601228, 0x16000fc2, 0x00100010 },
+{ 0x00800001, 0x2f2002e8, 0x008d0f80, 0x00000000 },
 { 0x00000041, 0x20c03ae8, 0x3e000020, 0x3f000000 },
 { 0x00000041, 0x20e03ae8, 0x3e000024, 0x3f000000 },
 { 0x00800001, 0x2ee002e8, 0x00000f60, 0x00000000 },
-{ 0x00800001, 0x2f2002e8, 0x008d0f80, 0x00000000 },
-{ 0x00000005, 0x2ec00208, 0x06000028, 0xff000000 },
-{ 0x0080015b, 0x6d1e0000, 0x80207001, 0x1dc72003 },
+{ 0x00000005, 0x2fa00208, 0x06000028, 0xff000000 },
 { 0x0080015b, 0x0f1e0000, 0x40206001, 0x1e472003 },
-{ 0x00000041, 0x2f641208, 0x16000fc0, 0x00400040 },
-{ 0x01000010, 0x20000201, 0x06000ec0, 0x07000000 },
-{ 0x00800040, 0x2da03ae8, 0x3a8d0da0, 0x00000040 },
+{ 0x0080015b, 0x6d1e0000, 0x80207001, 0x1dc72003 },
+{ 0x00000009, 0x2f640208, 0x1600002c, 0x00020002 },
+{ 0x00000041, 0x2f681228, 0x16000fc0, 0x00400040 },
+{ 0x01000010, 0x20000201, 0x06000fa0, 0x07000000 },
 { 0x00800040, 0x21e03ae8, 0x3a8d01e0, 0x0000003c },
+{ 0x00800040, 0x2da03ae8, 0x3a8d0da0, 0x00000040 },
 { 0x00000040, 0x21c00208, 0x16000044, 0x00010001 },
 { 0x00000040, 0x2de00208, 0x16000044, 0x00020002 },
 { 0x00000001, 0x2d600208, 0x00000048, 0x00000000 },
 { 0x00000040, 0x2d800228, 0x02000030, 0x00000f60 },
-{ 0x00000040, 0x22200228, 0x0200002c, 0x00000f64 },
+{ 0x00000040, 0x22200a28, 0x02000f68, 0x00000f64 },
 { 0x00010020, 0x34000005, 0x0e001400, 0x000020c0 },
 { 0x00000005, 0x2fc00208, 0x06000028, 0xff000000 },
 { 0x01000010, 0x20000200, 0x06000fc0, 0x08000000 },
diff --git a/src/shaders/post_processing/gen9/conv_10bit_8bit.g9b b/src/shaders/post_processing/gen9/conv_10bit_8bit.g9b
index c9971e7b..3eb246a1 100644
--- a/src/shaders/post_processing/gen9/conv_10bit_8bit.g9b
+++ b/src/shaders/post_processing/gen9/conv_10bit_8bit.g9b
@@ -1061,7 +1061,7 @@
 { 0x00000001, 0x2fc0020c, 0x000001cc, 0x00000000 },
 { 0x00000001, 0x2fc8060c, 0x00000000, 0x0007000f },
 { 0x0c600033, 0x00013014, 0x00002fc4, 0x00000000 },
-{ 0x00000020, 0x34000004, 0x0e001400, 0x00002bd0 },
+{ 0x00000020, 0x34000004, 0x0e001400, 0x00002be0 },
 { 0x0000000c, 0x21cc0a28, 0x1e0001cc, 0x00010001 },
 { 0x00600001, 0x2fc0020c, 0x008d0000, 0x00000000 },
 { 0x00000040, 0x22000204, 0x060001c8, 0x020a8000 },
@@ -1075,12 +1075,13 @@
 { 0x00000001, 0x2fa8060c, 0x00000000, 0x00070007 },
 { 0x00000040, 0x22000204, 0x06000e68, 0x020a8000 },
 { 0x0c600033, 0x0006d014, 0x00002fa2, 0x00000000 },
-{ 0x00000020, 0x34000004, 0x0e001400, 0x00002af0 },
+{ 0x00000020, 0x34000004, 0x0e001400, 0x00002b00 },
 { 0x00000041, 0x2fa01208, 0x16000e60, 0x00100010 },
-{ 0x00000041, 0x2fc01208, 0x160001c0, 0x00200020 },
+{ 0x00000041, 0x2fc41228, 0x160001c0, 0x00200020 },
+{ 0x00000009, 0x2fc00208, 0x1600002c, 0x00010001 },
 { 0x00000001, 0x21dc1e28, 0x00000000, 0x00000000 },
 { 0x00000040, 0x2e6c0228, 0x02000030, 0x00000fa0 },
-{ 0x00000040, 0x21cc0228, 0x0200002c, 0x00000fc0 },
+{ 0x00000040, 0x21cc0a28, 0x02000fc4, 0x00000fc0 },
 { 0x00600001, 0x2ec00208, 0x008d0000, 0x00000000 },
 { 0x00000005, 0x2de80208, 0x06000028, 0x00ff0000 },
 { 0x00800001, 0x2fa00608, 0x00000000, 0x00000000 },
diff --git a/src/shaders/post_processing/gen9/conv_8bit_420_rgb32.g9b b/src/shaders/post_processing/gen9/conv_8bit_420_rgb32.g9b
index 61820818..37bfe929 100644
--- a/src/shaders/post_processing/gen9/conv_8bit_420_rgb32.g9b
+++ b/src/shaders/post_processing/gen9/conv_8bit_420_rgb32.g9b
@@ -1,27 +1,28 @@
 { 0x00600001, 0x2fd02648, 0x00000000, 0x76543210 },
 { 0x00000005, 0x2fc0124c, 0x16000004, 0x07ff07ff },
 { 0x00600001, 0x2f801208, 0x008d0fd0, 0x00000000 },
-{ 0x00000005, 0x2fc2124c, 0x16000006, 0x07ff07ff },
 { 0x00000041, 0x20a01208, 0x16000fc0, 0x00100010 },
 { 0x00600040, 0x2fa00208, 0x168d0f80, 0x00080008 },
-{ 0x00000041, 0x2f601228, 0x16000fc2, 0x00100010 },
+{ 0x00000005, 0x2fc2124c, 0x16000006, 0x07ff07ff },
 { 0x00800040, 0x2f800208, 0x028d0f80, 0x000000a0 },
+{ 0x00000041, 0x2f601228, 0x16000fc2, 0x00100010 },
+{ 0x00800001, 0x2f2002e8, 0x008d0f80, 0x00000000 },
 { 0x00000041, 0x20c03ae8, 0x3e000020, 0x3f000000 },
 { 0x00000041, 0x20e03ae8, 0x3e000024, 0x3f000000 },
 { 0x00800001, 0x2ee002e8, 0x00000f60, 0x00000000 },
-{ 0x00800001, 0x2f2002e8, 0x008d0f80, 0x00000000 },
-{ 0x00000005, 0x2ec00208, 0x06000028, 0xff000000 },
-{ 0x0080015b, 0x661e0000, 0x80207001, 0x1dc72003 },
+{ 0x00000005, 0x2fa00208, 0x06000028, 0xff000000 },
 { 0x0080015b, 0x0f1e0000, 0x40206001, 0x1e472003 },
-{ 0x00000041, 0x2f641208, 0x16000fc0, 0x00400040 },
-{ 0x01000010, 0x20000201, 0x06000ec0, 0x07000000 },
-{ 0x00800040, 0x2cc03ae8, 0x3a8d0cc0, 0x00000040 },
+{ 0x0080015b, 0x661e0000, 0x80207001, 0x1dc72003 },
+{ 0x00000009, 0x2f640208, 0x1600002c, 0x00020002 },
+{ 0x00000041, 0x2f681228, 0x16000fc0, 0x00400040 },
+{ 0x01000010, 0x20000201, 0x06000fa0, 0x07000000 },
 { 0x00800040, 0x21e03ae8, 0x3a8d01e0, 0x0000003c },
+{ 0x00800040, 0x2cc03ae8, 0x3a8d0cc0, 0x00000040 },
 { 0x00000040, 0x21c00208, 0x16000044, 0x00010001 },
 { 0x00000040, 0x2d000208, 0x16000044, 0x00020002 },
 { 0x00000001, 0x2d080208, 0x00000048, 0x00000000 },
 { 0x00000040, 0x2d040228, 0x02000030, 0x00000f60 },
-{ 0x00000040, 0x21c40228, 0x0200002c, 0x00000f64 },
+{ 0x00000040, 0x21c40a28, 0x02000f68, 0x00000f64 },
 { 0x00010020, 0x34000005, 0x0e001400, 0x000020f0 },
 { 0x00000005, 0x2fc00208, 0x06000028, 0xff000000 },
 { 0x01000010, 0x20000200, 0x06000fc0, 0x08000000 },