ARB prog: replace 'unsigned' with 'gl_state_index'
Fixes compilation warnings with MSVC.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -23,6 +23,7 @@
|
||||
*/
|
||||
#include "main/glheader.h"
|
||||
#include "prog_instruction.h"
|
||||
#include "prog_statevars.h"
|
||||
|
||||
#include "program_parser.h"
|
||||
#include "program_parse.tab.h"
|
||||
|
@@ -324,7 +324,7 @@ typedef union YYSTYPE
|
||||
unsigned attrib;
|
||||
int integer;
|
||||
float real;
|
||||
unsigned state[5];
|
||||
gl_state_index state[STATE_LENGTH];
|
||||
int negate;
|
||||
struct asm_vector vector;
|
||||
gl_inst_opcode opcode;
|
||||
@@ -4946,8 +4946,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
|
||||
|
||||
name = _mesa_program_state_string(tokens);
|
||||
index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
|
||||
size, GL_NONE,
|
||||
NULL, (gl_state_index *) tokens, 0x0);
|
||||
size, GL_NONE, NULL, tokens, 0x0);
|
||||
param_list->StateFlags |= _mesa_program_state_flags(tokens);
|
||||
|
||||
/* free name string here since we duplicated it in add_parameter() */
|
||||
|
@@ -166,7 +166,7 @@ typedef union YYSTYPE
|
||||
unsigned attrib;
|
||||
int integer;
|
||||
float real;
|
||||
unsigned state[5];
|
||||
gl_state_index state[STATE_LENGTH];
|
||||
int negate;
|
||||
struct asm_vector vector;
|
||||
gl_inst_opcode opcode;
|
||||
|
@@ -117,7 +117,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
|
||||
unsigned attrib;
|
||||
int integer;
|
||||
float real;
|
||||
unsigned state[5];
|
||||
gl_state_index state[STATE_LENGTH];
|
||||
int negate;
|
||||
struct asm_vector vector;
|
||||
gl_inst_opcode opcode;
|
||||
@@ -2077,8 +2077,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
|
||||
|
||||
name = _mesa_program_state_string(tokens);
|
||||
index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
|
||||
size, GL_NONE,
|
||||
NULL, (gl_state_index *) tokens, 0x0);
|
||||
size, GL_NONE, NULL, tokens, 0x0);
|
||||
param_list->StateFlags |= _mesa_program_state_flags(tokens);
|
||||
|
||||
/* free name string here since we duplicated it in add_parameter() */
|
||||
|
Reference in New Issue
Block a user