diff options
| -rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c index 3605df4d5ce..bda45c01882 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -77,7 +77,7 @@ struct st_translate { unsigned insn_size; unsigned insn_count; - GLenum procType; + unsigned procType; /**< TGSI_PROCESSOR_VERTEX/FRAGMENT */ boolean error; }; @@ -126,7 +126,6 @@ static void set_insn_start( struct st_translate *t, } - /* * Map mesa register file to TGSI register file. */ @@ -158,7 +157,6 @@ dst_register( struct st_translate *t, } - static struct ureg_src src_register( struct st_translate *t, gl_register_file file, @@ -195,7 +193,7 @@ src_register( struct st_translate *t, } -/* +/** * Map mesa texture target to TGSI texture target. */ static unsigned @@ -224,7 +222,6 @@ translate_texture_target( GLuint textarget, } - static struct ureg_dst translate_dst( struct st_translate *t, const struct prog_dst_register *DstReg, @@ -247,9 +244,6 @@ translate_dst( struct st_translate *t, } - - - static struct ureg_src translate_src( struct st_translate *t, const struct prog_src_register *SrcReg ) @@ -274,6 +268,7 @@ translate_src( struct st_translate *t, return src; } + static struct ureg_src swizzle_4v( struct ureg_src src, const unsigned *swz ) { @@ -281,7 +276,8 @@ static struct ureg_src swizzle_4v( struct ureg_src src, } -/* Translate SWZ instructions into a single MAD. EG: +/** + * Translate SWZ instructions into a single MAD. EG: * * SWZ dst, src.x-y10 * @@ -603,7 +599,6 @@ compile_instruction( src, num_src ); return; - case OPCODE_SCS: dst[0] = ureg_writemask(dst[0], TGSI_WRITEMASK_XY ); ureg_insn( ureg, @@ -627,15 +622,9 @@ compile_instruction( src, num_src ); break; } - } - - - - - /** * Emit the TGSI instructions for inverting the WPOS y coordinate. */ @@ -680,8 +669,6 @@ emit_inverted_wpos( struct st_translate *t, } - - /** * Translate Mesa program to TGSI format. * \param program the program to translate @@ -689,14 +676,15 @@ emit_inverted_wpos( struct st_translate *t, * \param inputMapping maps Mesa fragment program inputs to TGSI generic * input indexes * \param inputSemanticName the TGSI_SEMANTIC flag for each input - * \param inputSemanticIndex the semantic index (ex: which texcoord) for each input + * \param inputSemanticIndex the semantic index (ex: which texcoord) for + * each input * \param interpMode the TGSI_INTERPOLATE_LINEAR/PERSP mode for each input - * \param numOutputs number of output registers used * \param outputMapping maps Mesa fragment program outputs to TGSI * generic outputs * \param outputSemanticName the TGSI_SEMANTIC flag for each output - * \param outputSemanticIndex the semantic index (ex: which texcoord) for each output + * \param outputSemanticIndex the semantic index (ex: which texcoord) for + * each output * * \return array of translated tokens, caller's responsibility to free */ |