Fix the error in render shader for subpicture

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g4a b/src/shaders/render/exa_wm_src_sample_argb.g4a
index 8cc693e..c657655 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g4a
+++ b/src/shaders/render/exa_wm_src_sample_argb.g4a
@@ -48,5 +48,5 @@ send (16) src_msg_ind         /* msg reg index */
                                /* here(src->dst) we should use src_sampler and src_surface */
        mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
 
-mul (8) src_sample_a_01<1>f src_sample_a_01<1>f global_alpha { align1 };
-mul (8) src_sample_a_23<1>f src_sample_a_23<1>f global_alpha { align1 };
+mul (8) src_sample_a_01<1>f src_sample_a_01<8,8,1>f global_alpha { align1 };
+mul (8) src_sample_a_23<1>f src_sample_a_23<8,8,1>f global_alpha { align1 };

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g4b b/src/shaders/render/exa_wm_src_sample_argb.g4b
index 963c121..42e4a68 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g4b
+++ b/src/shaders/render/exa_wm_src_sample_argb.g4b
@@ -1,4 +1,4 @@
    { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
    { 0x01800031, 0x21c01d29, 0x008d0000, 0x02580001 },
-   { 0x00600041, 0x228077bd, 0x00200280, 0x00000040 },
-   { 0x00600041, 0x22a077bd, 0x002002a0, 0x00000040 },
+   { 0x00600041, 0x228077bd, 0x008d0280, 0x00000040 },
+   { 0x00600041, 0x22a077bd, 0x008d02a0, 0x00000040 },

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g4b.gen5 b/src/shaders/render/exa_wm_src_sample_argb.g4b.gen5
index 45b3641..2012f89 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g4b.gen5
+++ b/src/shaders/render/exa_wm_src_sample_argb.g4b.gen5
@@ -1,4 +1,4 @@
    { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
    { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a8a0001 },
-   { 0x00600041, 0x228077bd, 0x00200280, 0x00000040 },
-   { 0x00600041, 0x22a077bd, 0x002002a0, 0x00000040 },
+   { 0x00600041, 0x228077bd, 0x008d0280, 0x00000040 },
+   { 0x00600041, 0x22a077bd, 0x008d02a0, 0x00000040 },

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g6a b/src/shaders/render/exa_wm_src_sample_argb.g6a
index 48e79f7..c30b209 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g6a
+++ b/src/shaders/render/exa_wm_src_sample_argb.g6a
@@ -50,6 +50,6 @@ send (16) src_msg_ind         /* msg reg index */
                                /* here(src->dst) we should use src_sampler and src_surface */
        mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
 
-mul (8) src_sample_a_01<1>f src_sample_a_01<1>f global_alpha { align1 };
+mul (8) src_sample_a_01<1>f src_sample_a_01<8,8,1>f global_alpha { align1 };
 mul (8) src_sample_a_23<1>f src_sample_a_23<1>f global_alpha { align1 };
 

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g6b b/src/shaders/render/exa_wm_src_sample_argb.g6b
index 8964e45..53c6248 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g6b
+++ b/src/shaders/render/exa_wm_src_sample_argb.g6b
@@ -1,5 +1,5 @@
    { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
    { 0x00600201, 0x20200022, 0x008d0000, 0x00000000 },
    { 0x02800031, 0x21c01cc9, 0x00000020, 0x0a8a0001 },
-   { 0x00600041, 0x228077bd, 0x00200280, 0x000000c0 },
+   { 0x00600041, 0x228077bd, 0x008d0280, 0x000000c0 },
    { 0x00600041, 0x22a077bd, 0x002002a0, 0x000000c0 },

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g7a b/src/shaders/render/exa_wm_src_sample_argb.g7a
index 620e0e7..0165f7b 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g7a
+++ b/src/shaders/render/exa_wm_src_sample_argb.g7a
@@ -54,6 +54,6 @@ send (16) src_msg_ind_gen7    /* msg reg index */
                                /* here(src->dst) we should use src_sampler and src_surface */
        mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
 
-mul (8) src_sample_a_01<1>f src_sample_a_01<1>f global_alpha { align1 mask_disable };
-mul (8) src_sample_a_23<1>f src_sample_a_23<1>f global_alpha { align1 mask_disable };
+mul (8) src_sample_a_01<1>f src_sample_a_01<8,8,1>f global_alpha { align1 mask_disable };
+mul (8) src_sample_a_23<1>f src_sample_a_23<8,8,1>f global_alpha { align1 mask_disable };
 

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g7b b/src/shaders/render/exa_wm_src_sample_argb.g7b
index 674fc74..0708bc0 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g7b
+++ b/src/shaders/render/exa_wm_src_sample_argb.g7b
@@ -1,5 +1,5 @@
    { 0x00000201, 0x20080061, 0x00000000, 0x00000000 },
    { 0x00600201, 0x28200021, 0x008d0000, 0x00000000 },
    { 0x02800031, 0x21c01ca9, 0x00000820, 0x0a8c0001 },
-   { 0x00600241, 0x228077bd, 0x00200280, 0x000000c0 },
-   { 0x00600241, 0x22a077bd, 0x002002a0, 0x000000c0 },
+   { 0x00600241, 0x228077bd, 0x008d0280, 0x000000c0 },
+   { 0x00600241, 0x22a077bd, 0x008d02a0, 0x000000c0 },

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g8a b/src/shaders/render/exa_wm_src_sample_argb.g8a
index 662ef22..3a4e99f 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g8a
+++ b/src/shaders/render/exa_wm_src_sample_argb.g8a
@@ -54,6 +54,6 @@ send (16) src_msg_ind_gen8    /* msg reg index */
                                /* here(src->dst) we should use src_sampler and src_surface */
        mlen 5 rlen 8 { align1 };   /* required message len 5, readback len 8 */
 
-mul (8) src_sample_a_01<1>f src_sample_a_01<1>f global_alpha { align1 mask_disable };
-mul (8) src_sample_a_23<1>f src_sample_a_23<1>f global_alpha { align1 mask_disable };
+mul (8) src_sample_a_01<1>f src_sample_a_01<8,8,1>f global_alpha { align1 mask_disable };
+mul (8) src_sample_a_23<1>f src_sample_a_23<8,8,1>f global_alpha { align1 mask_disable };
 

diff --git a/src/shaders/render/exa_wm_src_sample_argb.g8b b/src/shaders/render/exa_wm_src_sample_argb.g8b
index 3c86fb8..2b04637 100644 (file)
--- a/src/shaders/render/exa_wm_src_sample_argb.g8b
+++ b/src/shaders/render/exa_wm_src_sample_argb.g8b
@@ -1,5 +1,5 @@
    { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 },
    { 0x00600001, 0x2820020c, 0x008d0000, 0x00000000 },
    { 0x02800031, 0x21c00a48, 0x0e000820, 0x0a8c0001 },
-   { 0x00600041, 0x22803aec, 0x3a200280, 0x000000c0 },
-   { 0x00600041, 0x22a03aec, 0x3a2002a0, 0x000000c0 },
+   { 0x00600041, 0x22803aec, 0x3a8d0280, 0x000000c0 },
+   { 0x00600041, 0x22a03aec, 0x3a8d02a0, 0x000000c0 },