diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2014-10-08 08:48:53 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2014-10-08 09:01:38 +0800 |
| commit | 2b002e286c31c9b0c09c1f22237bb222ac77b97c (patch) | |
| tree | d8ef471847df59fed762960e87cf6feedc8eb736 /src/shaders/render/exa_wm_src_sample_argb.g4b.gen5 | |
| parent | 4568e24f0382d2d03215bcaf78eb0eae68f88ae5 (diff) | |
| parent | f11176415ec26eb5960ba6841d2d9c22f2cabc60 (diff) | |
| download | libva-intel-driver-2b002e286c31c9b0c09c1f22237bb222ac77b97c.tar.gz | |
Merge remote-tracking branch 'fdo/master' into g45-h264g45-h264
Some users still use this branch
Conflicts:
src/i965_avc_bsd.c
src/i965_avc_ildb.c
src/i965_drv_video.c
Diffstat (limited to 'src/shaders/render/exa_wm_src_sample_argb.g4b.gen5')
| -rw-r--r-- | src/shaders/render/exa_wm_src_sample_argb.g4b.gen5 | 4 |
1 files changed, 2 insertions, 2 deletions
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 45b36413..2012f89f 100644 --- 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 }, |