Mesa (10.2): i965: add missing parens in vec4 visitor
Emil Velikov
evelikov at kemper.freedesktop.org
Tue Sep 2 19:53:34 UTC 2014
Module: Mesa
Branch: 10.2
Commit: c4fa2bc7967861e8f830f40fb0bcef6d4dd12448
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4fa2bc7967861e8f830f40fb0bcef6d4dd12448
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 2 10:13:02 2014 +1000
i965: add missing parens in vec4 visitor
coverity reported this, Matt said it look like missing parens,
not bad identing, so lets try that.
Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 94a909ec2df779bfdac6f42a25077b427b3873ea)
---
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index 88ab512..9aec80f 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -2478,7 +2478,7 @@ vec4_visitor::visit(ir_texture *ir)
} else if (ir->op == ir_txf_ms) {
emit(MOV(dst_reg(MRF, param_base + 1, sample_index_type, WRITEMASK_X),
sample_index));
- if (brw->gen >= 7)
+ if (brw->gen >= 7) {
/* MCS data is in the first channel of `mcs`, but we need to get it into
* the .y channel of the second vec4 of params, so replicate .x across
* the whole vec4 and then mask off everything except .y
@@ -2486,6 +2486,7 @@ vec4_visitor::visit(ir_texture *ir)
mcs.swizzle = BRW_SWIZZLE_XXXX;
emit(MOV(dst_reg(MRF, param_base + 1, glsl_type::uint_type, WRITEMASK_Y),
mcs));
+ }
inst->mlen++;
} else if (ir->op == ir_txd) {
const glsl_type *type = lod_type;
More information about the mesa-commit
mailing list