summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/vl/vl_shader_build.c
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-11-24 15:02:23 +0000
committerKeith Whitwell <keithw@vmware.com>2009-11-24 15:02:23 +0000
commit7d6c8f980d1e23ad6f557d650e89c715861a3b0c (patch)
treeb947e26ce1a03497b8a2863ef47d465089ac7ca9 /src/gallium/auxiliary/vl/vl_shader_build.c
parent763426a0256f0ab06f8af53947bd630f8600183a (diff)
downloadexternal_mesa3d-7d6c8f980d1e23ad6f557d650e89c715861a3b0c.zip
external_mesa3d-7d6c8f980d1e23ad6f557d650e89c715861a3b0c.tar.gz
external_mesa3d-7d6c8f980d1e23ad6f557d650e89c715861a3b0c.tar.bz2
tgsi: rename fields of tgsi_full_instruction to avoid excessive verbosity
InstructionPredicate -> Predicate InstructionLabel -> Label InstructionTexture -> Texture FullSrcRegisters -> Src FullDstRegisters -> Dst
Diffstat (limited to 'src/gallium/auxiliary/vl/vl_shader_build.c')
-rw-r--r--src/gallium/auxiliary/vl/vl_shader_build.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/gallium/auxiliary/vl/vl_shader_build.c b/src/gallium/auxiliary/vl/vl_shader_build.c
index d052e2c..82300b1 100644
--- a/src/gallium/auxiliary/vl/vl_shader_build.c
+++ b/src/gallium/auxiliary/vl/vl_shader_build.c
@@ -138,11 +138,11 @@ struct tgsi_full_instruction vl_inst2
inst.Instruction.Opcode = opcode;
inst.Instruction.NumDstRegs = 1;
- inst.FullDstRegisters[0].DstRegister.File = dst_file;
- inst.FullDstRegisters[0].DstRegister.Index = dst_index;
+ inst.Dst[0].DstRegister.File = dst_file;
+ inst.Dst[0].DstRegister.Index = dst_index;
inst.Instruction.NumSrcRegs = 1;
- inst.FullSrcRegisters[0].SrcRegister.File = src_file;
- inst.FullSrcRegisters[0].SrcRegister.Index = src_index;
+ inst.Src[0].SrcRegister.File = src_file;
+ inst.Src[0].SrcRegister.Index = src_index;
return inst;
}
@@ -162,13 +162,13 @@ struct tgsi_full_instruction vl_inst3
inst.Instruction.Opcode = opcode;
inst.Instruction.NumDstRegs = 1;
- inst.FullDstRegisters[0].DstRegister.File = dst_file;
- inst.FullDstRegisters[0].DstRegister.Index = dst_index;
+ inst.Dst[0].DstRegister.File = dst_file;
+ inst.Dst[0].DstRegister.Index = dst_index;
inst.Instruction.NumSrcRegs = 2;
- inst.FullSrcRegisters[0].SrcRegister.File = src1_file;
- inst.FullSrcRegisters[0].SrcRegister.Index = src1_index;
- inst.FullSrcRegisters[1].SrcRegister.File = src2_file;
- inst.FullSrcRegisters[1].SrcRegister.Index = src2_index;
+ inst.Src[0].SrcRegister.File = src1_file;
+ inst.Src[0].SrcRegister.Index = src1_index;
+ inst.Src[1].SrcRegister.File = src2_file;
+ inst.Src[1].SrcRegister.Index = src2_index;
return inst;
}
@@ -188,15 +188,15 @@ struct tgsi_full_instruction vl_tex
inst.Instruction.Opcode = TGSI_OPCODE_TEX;
inst.Instruction.NumDstRegs = 1;
- inst.FullDstRegisters[0].DstRegister.File = dst_file;
- inst.FullDstRegisters[0].DstRegister.Index = dst_index;
+ inst.Dst[0].DstRegister.File = dst_file;
+ inst.Dst[0].DstRegister.Index = dst_index;
inst.Instruction.NumSrcRegs = 2;
inst.Instruction.Texture = 1;
- inst.InstructionTexture.Texture = tex;
- inst.FullSrcRegisters[0].SrcRegister.File = src1_file;
- inst.FullSrcRegisters[0].SrcRegister.Index = src1_index;
- inst.FullSrcRegisters[1].SrcRegister.File = src2_file;
- inst.FullSrcRegisters[1].SrcRegister.Index = src2_index;
+ inst.Texture.Texture = tex;
+ inst.Src[0].SrcRegister.File = src1_file;
+ inst.Src[0].SrcRegister.Index = src1_index;
+ inst.Src[1].SrcRegister.File = src2_file;
+ inst.Src[1].SrcRegister.Index = src2_index;
return inst;
}
@@ -218,15 +218,15 @@ struct tgsi_full_instruction vl_inst4
inst.Instruction.Opcode = opcode;
inst.Instruction.NumDstRegs = 1;
- inst.FullDstRegisters[0].DstRegister.File = dst_file;
- inst.FullDstRegisters[0].DstRegister.Index = dst_index;
+ inst.Dst[0].DstRegister.File = dst_file;
+ inst.Dst[0].DstRegister.Index = dst_index;
inst.Instruction.NumSrcRegs = 3;
- inst.FullSrcRegisters[0].SrcRegister.File = src1_file;
- inst.FullSrcRegisters[0].SrcRegister.Index = src1_index;
- inst.FullSrcRegisters[1].SrcRegister.File = src2_file;
- inst.FullSrcRegisters[1].SrcRegister.Index = src2_index;
- inst.FullSrcRegisters[2].SrcRegister.File = src3_file;
- inst.FullSrcRegisters[2].SrcRegister.Index = src3_index;
+ inst.Src[0].SrcRegister.File = src1_file;
+ inst.Src[0].SrcRegister.Index = src1_index;
+ inst.Src[1].SrcRegister.File = src2_file;
+ inst.Src[1].SrcRegister.Index = src2_index;
+ inst.Src[2].SrcRegister.File = src3_file;
+ inst.Src[2].SrcRegister.Index = src3_index;
return inst;
}