summaryrefslogtreecommitdiff
authorEric Anholt <eric@anholt.net>2009-08-05 19:45:16 (GMT)
committer Eric Anholt <eric@anholt.net>2009-08-05 22:07:14 (GMT)
commit79b6851148574419389ac8055b0c31b8bdac3ab3 (patch) (side-by-side diff)
treecb6e1dfa03765a5d51ef7a1d2015c1b083433b3e
parentf4e4c1a8544e264c5a1da02f4e7990a1beecf71e (diff)
downloadxf86-video-intel-79b6851148574419389ac8055b0c31b8bdac3ab3.zip
xf86-video-intel-79b6851148574419389ac8055b0c31b8bdac3ab3.tar.gz
Fix sampler indexes on i965 planar video.
We only set up one sampler, because all of our sampling is the same. By using a non-zero index for the other two samplers, we'd dereference (likely) zeroed data, resulting in using NEAREST filtering. This was a regression in 40671132cb3732728703c6444f4577467fa9223f which incidentally switched from having 6 samplers to 1. Bug #22895, #19856
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/render_program/exa_wm_src_sample_planar.g4a4
-rw-r--r--src/render_program/exa_wm_src_sample_planar.g4b4
-rw-r--r--src/render_program/exa_wm_src_sample_planar.g4b.gen54
3 files changed, 6 insertions, 6 deletions
diff --git a/src/render_program/exa_wm_src_sample_planar.g4a b/src/render_program/exa_wm_src_sample_planar.g4a
index ca77b48..ad33350 100644
--- a/src/render_program/exa_wm_src_sample_planar.g4a
+++ b/src/render_program/exa_wm_src_sample_planar.g4a
@@ -52,7 +52,7 @@ send (16) src_msg_ind /* msg reg index */
send (16) src_msg_ind /* msg reg index */
src_sample_r<1>UW /* readback */
g0<8,8,1>UW /* copy to msg start reg*/
- sampler (3,2,F) /* sampler message description, (binding_table,sampler_index,datatype)
+ sampler (3,0,F) /* sampler message description, (binding_table,sampler_index,datatype)
/* here(src->dst) we should use src_sampler and src_surface */
mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */
@@ -60,6 +60,6 @@ send (16) src_msg_ind /* msg reg index */
send (16) src_msg_ind /* msg reg index */
src_sample_b<1>UW /* readback */
g0<8,8,1>UW /* copy to msg start reg*/
- sampler (5,4,F) /* sampler message description, (binding_table,sampler_index,datatype)
+ sampler (5,0,F) /* sampler message description, (binding_table,sampler_index,datatype)
/* here(src->dst) we should use src_sampler and src_surface */
mlen 5 rlen 2 { align1 }; /* required message len 5, readback len 8 */
diff --git a/src/render_program/exa_wm_src_sample_planar.g4b b/src/render_program/exa_wm_src_sample_planar.g4b
index 77a5c23..23e5e0d 100644
--- a/src/render_program/exa_wm_src_sample_planar.g4b
+++ b/src/render_program/exa_wm_src_sample_planar.g4b
@@ -1,4 +1,4 @@
{ 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
{ 0x01800031, 0x22001d29, 0x008d0000, 0x02520001 },
- { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520203 },
- { 0x01800031, 0x22401d29, 0x008d0000, 0x02520405 },
+ { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520003 },
+ { 0x01800031, 0x22401d29, 0x008d0000, 0x02520005 },
diff --git a/src/render_program/exa_wm_src_sample_planar.g4b.gen5 b/src/render_program/exa_wm_src_sample_planar.g4b.gen5
index a381e68..71068d9 100644
--- a/src/render_program/exa_wm_src_sample_planar.g4b.gen5
+++ b/src/render_program/exa_wm_src_sample_planar.g4b.gen5
@@ -1,4 +1,4 @@
{ 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
{ 0x01800031, 0x22001d29, 0x208d0000, 0x0a2a0001 },
- { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0203 },
- { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0405 },
+ { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0003 },
+ { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0005 },