Mesa (master): glsl_to_tgsi: make glsl_to_tgsi_visitor:: emit_dp return the instruction
Bryan Cain
bryanc at kemper.freedesktop.org
Sat Aug 20 19:20:59 UTC 2011
Module: Mesa
Branch: master
Commit: c15eb5569bf76c5dc41327017b92a5d960207b97
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c15eb5569bf76c5dc41327017b92a5d960207b97
Author: Bryan Cain <bryancain3 at gmail.com>
Date: Wed Aug 17 20:34:19 2011 -0500
glsl_to_tgsi: make glsl_to_tgsi_visitor::emit_dp return the instruction
---
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 5f4aef1..62127af 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -373,11 +373,11 @@ public:
/**
* Emit the correct dot-product instruction for the type of arguments
*/
- void emit_dp(ir_instruction *ir,
- st_dst_reg dst,
- st_src_reg src0,
- st_src_reg src1,
- unsigned elements);
+ glsl_to_tgsi_instruction *emit_dp(ir_instruction *ir,
+ st_dst_reg dst,
+ st_src_reg src0,
+ st_src_reg src1,
+ unsigned elements);
void emit_scalar(ir_instruction *ir, unsigned op,
st_dst_reg dst, st_src_reg src0);
@@ -642,7 +642,7 @@ glsl_to_tgsi_visitor::get_opcode(ir_instruction *ir, unsigned op,
return op;
}
-void
+glsl_to_tgsi_instruction *
glsl_to_tgsi_visitor::emit_dp(ir_instruction *ir,
st_dst_reg dst, st_src_reg src0, st_src_reg src1,
unsigned elements)
@@ -651,7 +651,7 @@ glsl_to_tgsi_visitor::emit_dp(ir_instruction *ir,
TGSI_OPCODE_DP2, TGSI_OPCODE_DP3, TGSI_OPCODE_DP4
};
- emit(ir, dot_opcodes[elements - 2], dst, src0, src1);
+ return emit(ir, dot_opcodes[elements - 2], dst, src0, src1);
}
/**
More information about the mesa-commit
mailing list