[Mesa-dev] [PATCH 20/23] mesa: Remove remnants of PROGRAM_VARYING.

[Kenneth Graunke]

On 10/15/2012 04:22 PM, Eric Anholt wrote:
> Kenneth Graunke <kenneth at whitecape.org> writes:
>
>> The previous patch removed the producer of things in this file.
>> Since there aren't any, we can remove it.
>> ---
>>   src/mesa/main/mtypes.h                   | 1 -
>>   src/mesa/program/prog_parameter_layout.c | 2 +-
>>   src/mesa/program/prog_print.c            | 5 -----
>>   src/mesa/program/programopt.c            | 7 ++-----
>>   src/mesa/state_tracker/st_program.c      | 2 --
>>   5 files changed, 3 insertions(+), 14 deletions(-)
>>
>> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>> index b22d183..5d3c627 100644
>> --- a/src/mesa/main/mtypes.h
>> +++ b/src/mesa/main/mtypes.h
>> @@ -1851,7 +1851,6 @@ typedef enum
>>      PROGRAM_TEMPORARY,   /**< machine->Temporary[] */
>>      PROGRAM_INPUT,       /**< machine->Inputs[] */
>>      PROGRAM_OUTPUT,      /**< machine->Outputs[] */
>> -   PROGRAM_VARYING,     /**< machine->Inputs[]/Outputs[] */
>>      PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */
>>      PROGRAM_ENV_PARAM,   /**< gl_program->Parameters[] */
>>      PROGRAM_STATE_VAR,   /**< gl_program->Parameters[] */
>> diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c
>> index e4f2db3..ea919ab 100644
>> --- a/src/mesa/program/prog_parameter_layout.c
>> +++ b/src/mesa/program/prog_parameter_layout.c
>> @@ -173,7 +173,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
>>   	    continue;
>>   	 }
>>
>> -	 if ((inst->SrcReg[i].Base.File <= PROGRAM_VARYING )
>> +	 if ((inst->SrcReg[i].Base.File <= PROGRAM_LOCAL_PARAM)
>>   	     || (inst->SrcReg[i].Base.File >= PROGRAM_WRITE_ONLY)) {
>>   	    continue;
>
> Don't you mean PROGRAM_OUTPUT here?  This code wants to run on
> LOCAL/ENV/STATE/etc. I think.

Oops...right.  I've fixed that.  Thanks!