[Libva] [PATCH 3/3] Keep binding table index consistent for gen7

[lizhong]

On 06/05/2014 01:28 PM, Xiang, Haihao wrote:
> On Thu, 2014-06-05 at 13:11 +0800, lizhong wrote:
>> On 06/05/2014 12:14 PM, Xiang, Haihao wrote:
>>> It would be better to merge 1/3 and 3/3 into a single patch.
>> [Zhong] I separated them because I want to show sharders of patch 1/3
>> totally come from driver v1.0.20.
>> And patch 3/3 is a bug fixing when I implement quality level
>> configuration, it depends on driver implementation.
> So 1/3 introduces a bug and 3/3 tries to fix this bug, it doesn't make
> sense to me.
>
[Zhong] Ok, I'll merge the two patches, it's ok for me.
>>>> Make binding table indexs of old vme shader match our driver.
>>>> Then shader binary needs to be rebuilt.
>>>>
>>>> Signed-off-by: Zhong Li <zhong.li at intel.com>
>>>> ---
>>>>    src/shaders/vme_old/gen7_vme_header.inc |    8 ++++----
>>>>    src/shaders/vme_old/inter_frame.g7b     |    4 ++--
>>>>    src/shaders/vme_old/intra_frame.g7b     |    4 ++--
>>>>    3 files changed, 8 insertions(+), 8 deletions(-)
>>>>
>>>> diff --git a/src/shaders/vme_old/gen7_vme_header.inc b/src/shaders/vme_old/gen7_vme_header.inc
>>>> index 9cec738..471fe4d 100644
>>>> --- a/src/shaders/vme_old/gen7_vme_header.inc
>>>> +++ b/src/shaders/vme_old/gen7_vme_header.inc
>>>> @@ -30,10 +30,10 @@ define(`INTRA_PRED_AVAIL_FLAG_B',       `0x10')
>>>>    define(`INTRA_PRED_AVAIL_FLAG_C',       `0x8')
>>>>    define(`INTRA_PRED_AVAIL_FLAG_D',       `0x4')
>>>>    
>>>> -define(`BIND_IDX_VME',                  `1')
>>>> -define(`BIND_IDX_VME_REF0',             `2')
>>>> -define(`BIND_IDX_VME_REF1',             `3')
>>>> -define(`BIND_IDX_OUTPUT',               `0')
>>>> +define(`BIND_IDX_VME',                  `0')
>>>> +define(`BIND_IDX_VME_REF0',             `1')
>>>> +define(`BIND_IDX_VME_REF1',             `2')
>>>> +define(`BIND_IDX_OUTPUT',               `3')
>>>>    define(`BIND_IDX_INEP',                 `4')
>>>>    
>>>>    define(`SUB_PEL_MODE_INTEGER',          `0x00000000')
>>>> diff --git a/src/shaders/vme_old/inter_frame.g7b b/src/shaders/vme_old/inter_frame.g7b
>>>> index 3d4fbb4..3947872 100644
>>>> --- a/src/shaders/vme_old/inter_frame.g7b
>>>> +++ b/src/shaders/vme_old/inter_frame.g7b
>>>> @@ -13,7 +13,7 @@
>>>>       { 0x00600001, 0x28400061, 0x00000000, 0x00000000 },
>>>>       { 0x00600001, 0x28600061, 0x00000000, 0x00000000 },
>>>>       { 0x00600001, 0x28800061, 0x00000000, 0x00000000 },
>>>> -   { 0x08600031, 0x21801cbd, 0x00000800, 0x0a682001 },
>>>> +   { 0x08600031, 0x21801cbd, 0x00000800, 0x0a682000 },
>>>>       { 0x00000041, 0x24684521, 0x000000a2, 0x000000a1 },
>>>>       { 0x00000040, 0x24684421, 0x00000468, 0x000000a0 },
>>>>       { 0x00000041, 0x24680c21, 0x00000468, 0x00000004 },
>>>> @@ -23,6 +23,6 @@
>>>>       { 0x00200040, 0x24603dad, 0x00450460, 0xffe0ffe0 },
>>>>       { 0x00600001, 0x28200021, 0x008c0460, 0x00000000 },
>>>>       { 0x00600001, 0x28400021, 0x008c0460, 0x00000000 },
>>>> -   { 0x0a800031, 0x20001cac, 0x00000800, 0x060a0300 },
>>>> +   { 0x0a800031, 0x20001cac, 0x00000800, 0x060a0303 },
>>>>       { 0x00600001, 0x28000021, 0x008d0000, 0x00000000 },
>>>>       { 0x07800031, 0x24001ca8, 0x00000800, 0x82000010 },
>>>> diff --git a/src/shaders/vme_old/intra_frame.g7b b/src/shaders/vme_old/intra_frame.g7b
>>>> index cc063d8..900af41 100644
>>>> --- a/src/shaders/vme_old/intra_frame.g7b
>>>> +++ b/src/shaders/vme_old/intra_frame.g7b
>>>> @@ -33,7 +33,7 @@
>>>>       { 0x00600001, 0x288000e1, 0x00000000, 0x00000000 },
>>>>       { 0x00800001, 0x28800231, 0x00cf0283, 0x00000000 },
>>>>       { 0x00000001, 0x28900061, 0x00000000, 0x11111111 },
>>>> -   { 0x08600031, 0x21801cbd, 0x00000800, 0x0a184001 },
>>>> +   { 0x08600031, 0x21801cbd, 0x00000800, 0x0a184000 },
>>>>       { 0x00000041, 0x24684521, 0x000000a2, 0x000000a1 },
>>>>       { 0x00000040, 0x24684421, 0x00000468, 0x000000a0 },
>>>>       { 0x00000001, 0x24740231, 0x00000014, 0x00000000 },
>>>> @@ -42,6 +42,6 @@
>>>>       { 0x00000001, 0x28240021, 0x00000190, 0x00000000 },
>>>>       { 0x00000001, 0x28280021, 0x00000194, 0x00000000 },
>>>>       { 0x00000001, 0x282c0021, 0x00000198, 0x00000000 },
>>>> -   { 0x0a800031, 0x20001cac, 0x00000800, 0x040a0000 },
>>>> +   { 0x0a800031, 0x20001cac, 0x00000800, 0x040a0003 },
>>>>       { 0x00600001, 0x28000021, 0x008d0000, 0x00000000 },
>>>>       { 0x07800031, 0x24001ca8, 0x00000800, 0x82000010 },
>>>
>>>
>
>
>