diff options
| -rw-r--r-- | src/mesa/shader/nvvertparse.c | 23 | ||||
| -rw-r--r-- | src/mesa/shader/program.c | 25 |
2 files changed, 25 insertions, 23 deletions
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c index e2c14b9918..fc44a49d4c 100644 --- a/src/mesa/shader/nvvertparse.c +++ b/src/mesa/shader/nvvertparse.c @@ -1580,26 +1580,3 @@ _mesa_nv_vertex_output_register_name(GLuint i) return OutputRegisters[i]; } - -/** - * Initialize program instruction fields to defaults. - */ -void -_mesa_init_instruction(struct prog_instruction *inst) -{ - _mesa_bzero(inst, sizeof(struct prog_instruction)); - - inst->SrcReg[0].File = PROGRAM_UNDEFINED; - inst->SrcReg[0].Swizzle = SWIZZLE_NOOP; - inst->SrcReg[1].File = PROGRAM_UNDEFINED; - inst->SrcReg[1].Swizzle = SWIZZLE_NOOP; - inst->SrcReg[2].File = PROGRAM_UNDEFINED; - inst->SrcReg[2].Swizzle = SWIZZLE_NOOP; - - inst->DstReg.File = PROGRAM_UNDEFINED; - inst->DstReg.WriteMask = WRITEMASK_XYZW; - inst->DstReg.CondMask = COND_TR; - inst->DstReg.CondSwizzle = SWIZZLE_NOOP; - - inst->Precision = FLOAT32; -} diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 38982de993..b6371329a5 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -1192,6 +1192,31 @@ _mesa_load_state_parameters(GLcontext *ctx, /** + * Initialize program instruction fields to defaults. + */ +void +_mesa_init_instruction(struct prog_instruction *inst) +{ + _mesa_bzero(inst, sizeof(struct prog_instruction)); + + inst->SrcReg[0].File = PROGRAM_UNDEFINED; + inst->SrcReg[0].Swizzle = SWIZZLE_NOOP; + inst->SrcReg[1].File = PROGRAM_UNDEFINED; + inst->SrcReg[1].Swizzle = SWIZZLE_NOOP; + inst->SrcReg[2].File = PROGRAM_UNDEFINED; + inst->SrcReg[2].Swizzle = SWIZZLE_NOOP; + + inst->DstReg.File = PROGRAM_UNDEFINED; + inst->DstReg.WriteMask = WRITEMASK_XYZW; + inst->DstReg.CondMask = COND_TR; + inst->DstReg.CondSwizzle = SWIZZLE_NOOP; + + inst->SaturateMode = SATURATE_OFF; + inst->Precision = FLOAT32; +} + + +/** * Basic info about each instruction */ struct instruction_info |