On Mon, Jun 23, 2014 at 7:25 PM, Carl Worth <cwo...@cworth.org> wrote:
> Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de> writes:
>> Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF might have a subop set.
>> After folding, make sure that it is cleared
>>
>> Signed-off-by: Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de>
>> Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
> Cc: "10.1 10.2" <mesa-sta...@lists.freedesktop.org>
>
> Hi Tobias and Ilia,
>
> This patch isn't picking cleanly over to the 10.1 branch.
>
> Can you give me some guidance here? Either of the following replies
> would be great:
>
> Don't worry about this for 10.1 because...
>
> Here's a backported patch for 10.1...
Here's a backported patch for 10.1...
-ilia
From db30c022ff9e83e8bf42177642af8663d26c0cac Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de>
Date: Wed, 4 Jun 2014 00:35:47 +0200
Subject: [PATCH] nv50/ir: clear subop when folding constant expressions
Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF) might have a subop set.
After folding, make sure that it is cleared
Signed-off-by: Tobias Klausmann <tobias.johannes.klausm...@mni.thm.de>
Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
Cc: "10.1 10.2" <mesa-sta...@lists.freedesktop.org>
---
src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 1ea278b..fde5616 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -535,6 +535,7 @@ ConstantFolding::expr(Instruction *i,
} else {
i->op = OP_MOV;
}
+ i->subOp = 0;
}
void
--
1.8.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
