Mesa (10.5): nv50/ir: fix asFlow() const helper for OP_JOIN

Emil Velikov evelikov at kemper.freedesktop.org
Wed May 6 13:27:12 UTC 2015


Module: Mesa
Branch: 10.5
Commit: 071402cc3b3e70c25a69d0add06760ec5bd2d4f4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=071402cc3b3e70c25a69d0add06760ec5bd2d4f4

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Wed Apr 29 23:33:27 2015 -0400

nv50/ir: fix asFlow() const helper for OP_JOIN

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit db269ae495425849804fb1d05cfe42b0d3d304b3)

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h
index 255324f..e465f24 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_inlines.h
@@ -302,7 +302,7 @@ FlowInstruction *Instruction::asFlow()
 
 const FlowInstruction *Instruction::asFlow() const
 {
-   if (op >= OP_BRA && op <= OP_JOINAT)
+   if (op >= OP_BRA && op <= OP_JOIN)
       return static_cast<const FlowInstruction *>(this);
    return NULL;
 }




More information about the mesa-commit mailing list