summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-01-30 17:50:02 -0800
committerKenneth Graunke <[email protected]>2014-01-31 17:50:09 -0800
commite1cdafe6f78b4e271fd22da2e8d92c2684282e77 (patch)
treed84e137075b7f7ec1dcf414245d177e078d732ef
parentd8878055f5f46726822d03cd3a81e53e5ee50059 (diff)
i965: Fix math instruction hstride assertions on Broadwell.
In the final revision of my gen8_generator patch, I updated the MATH instruction's assertion from (dst.hstride == 1) to check that source and destination hstride matched. Unfortunately, I didn't test this enough, and many Piglit tests fail this test. The documentation indicates that "scalar source is also supported", which we believe means <0,1,0> access mode (hstride == 0). If hstride is non-zero, then it must match the destination register. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Matt Turner <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/gen8_generator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_generator.cpp b/src/mesa/drivers/dri/i965/gen8_generator.cpp
index ee5f792187f..1e2ac09bfd5 100644
--- a/src/mesa/drivers/dri/i965/gen8_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_generator.cpp
@@ -299,7 +299,7 @@ gen8_generator::math(unsigned math_function,
{
gen8_instruction *inst = next_inst(BRW_OPCODE_MATH);
- assert(dst.hstride == src0.hstride);
+ assert(src0.hstride == 0 || src0.hstride == dst.hstride);
gen8_set_math_function(inst, math_function);
gen8_set_dst(brw, inst, dst);