[Mesa-dev] [PATCH 78/78] nir: Fix output swizzle in get_mul_for_src
Eduardo Lima Mitev
elima at igalia.com
Fri Jun 26 01:07:34 PDT 2015
From: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Avoid copying an overwritten swizzle, use the original values.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89580
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
---
src/glsl/nir/nir_opt_peephole_ffma.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/glsl/nir/nir_opt_peephole_ffma.c b/src/glsl/nir/nir_opt_peephole_ffma.c
index 798506b..7c9ac12 100644
--- a/src/glsl/nir/nir_opt_peephole_ffma.c
+++ b/src/glsl/nir/nir_opt_peephole_ffma.c
@@ -76,6 +76,7 @@ static nir_alu_instr *
get_mul_for_src(nir_alu_src *src, int num_components,
uint8_t swizzle[4], bool *negate, bool *abs)
{
+ uint8_t swizzle_tmp[4];
assert(src->src.is_ssa && !src->abs && !src->negate);
nir_instr *instr = src->src.ssa->parent_instr;
@@ -116,8 +117,10 @@ get_mul_for_src(nir_alu_src *src, int num_components,
if (!alu)
return NULL;
+ /* Copy swizzle data before overwriting it */
+ memcpy(swizzle_tmp, swizzle, 4*sizeof(uint8_t));
for (unsigned i = 0; i < num_components; i++)
- swizzle[i] = swizzle[src->swizzle[i]];
+ swizzle[i] = swizzle_tmp[src->swizzle[i]];
return alu;
}
--
2.1.4
More information about the mesa-dev
mailing list