From de99760bf3511d05185799c4fb4347f9e5f420f4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 12 Nov 2005 17:53:14 +0000 Subject: Move stuff common to vertex/fragment_program into the base class, including: Instructions, InputsRead, OutputsWritten, and Parameters. Also, added debug functions: _mesa_print_instruction(), _mesa_print_program_parameters() and revamp _mesa_print_program(). --- src/mesa/shader/arbvertparse.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mesa/shader/arbvertparse.c') diff --git a/src/mesa/shader/arbvertparse.c b/src/mesa/shader/arbvertparse.c index bb18a2ea47..253f2937ed 100644 --- a/src/mesa/shader/arbvertparse.c +++ b/src/mesa/shader/arbvertparse.c @@ -71,9 +71,9 @@ _mesa_parse_arb_vertex_program(GLcontext * ctx, GLenum target, } _mesa_memcpy(newInstructions, ap.VPInstructions, ap.Base.NumInstructions * sizeof(struct prog_instruction)); - if (program->Instructions) - _mesa_free(program->Instructions); - program->Instructions = newInstructions; + if (program->Base.Instructions) + _mesa_free(program->Base.Instructions); + program->Base.Instructions = newInstructions; program->Base.String = ap.Base.String; program->Base.NumInstructions = ap.Base.NumInstructions; program->Base.NumTemporaries = ap.Base.NumTemporaries; @@ -81,16 +81,16 @@ _mesa_parse_arb_vertex_program(GLcontext * ctx, GLenum target, program->Base.NumAttributes = ap.Base.NumAttributes; program->Base.NumAddressRegs = ap.Base.NumAddressRegs; program->IsPositionInvariant = ap.HintPositionInvariant; - program->InputsRead = ap.InputsRead; - program->OutputsWritten = ap.OutputsWritten; + program->Base.InputsRead = ap.Base.InputsRead; + program->Base.OutputsWritten = ap.Base.OutputsWritten; - if (program->Parameters) { + if (program->Base.Parameters) { /* free previous program's parameters */ - _mesa_free_parameter_list(program->Parameters); + _mesa_free_parameter_list(program->Base.Parameters); } - program->Parameters = ap.Parameters; + program->Base.Parameters = ap.Base.Parameters; #if DEBUG_VP - _mesa_print_program(ap.Base.NumInstructions, ap.VPInstructions); + _mesa_print_program(&program->Base); #endif } -- cgit v1.2.3