Continue reducing dependencies on core mesa include files.

[mesa.git] / src / mesa / pipe / tgsi / core / tgsi_build.h

diff --git a/src/mesa/pipe/tgsi/core/tgsi_build.h b/src/mesa/pipe/tgsi/core/tgsi_build.h
index db259565193502856d256f4d2455be057e9b8065..8b5db5662c9b69284d132bec222e69e4320cfa50 100644 (file)
--- a/src/mesa/pipe/tgsi/core/tgsi_build.h
+++ b/src/mesa/pipe/tgsi/core/tgsi_build.h
@@ -24,7 +24,7 @@ tgsi_default_processor( void );
 
 struct tgsi_processor
 tgsi_build_processor(
-   GLuint processor,
+   unsigned processor,
    struct tgsi_header *header );
 
 /*
@@ -36,31 +36,31 @@ tgsi_default_declaration( void );
 
 struct tgsi_declaration
 tgsi_build_declaration(
-   GLuint file,
-   GLuint declare,
-   GLuint interpolate,
+   unsigned file,
+   unsigned declare,
+   unsigned interpolate,
    struct tgsi_header *header );
 
 struct tgsi_full_declaration
 tgsi_default_full_declaration( void );
 
-GLuint
+unsigned
 tgsi_build_full_declaration(
    const struct tgsi_full_declaration *full_decl,
    struct tgsi_token *tokens,
    struct tgsi_header *header,
-   GLuint maxsize );
+   unsigned maxsize );
 
 struct tgsi_declaration_range
 tgsi_build_declaration_range(
-   GLuint first,
-   GLuint last,
+   unsigned first,
+   unsigned last,
    struct tgsi_declaration *declaration,
    struct tgsi_header *header );
 
 struct tgsi_declaration_mask
 tgsi_build_declaration_mask(
-   GLuint mask,
+   unsigned mask,
    struct tgsi_declaration *declaration,
    struct tgsi_header *header );
 
@@ -69,7 +69,7 @@ tgsi_default_declaration_interpolation( void );
 
 struct tgsi_declaration_interpolation
 tgsi_build_declaration_interpolation(
-   GLuint interpolate,
+   unsigned interpolate,
    struct tgsi_declaration *declaration,
    struct tgsi_header *header );
 
@@ -89,16 +89,16 @@ tgsi_default_full_immediate( void );
 
 struct tgsi_immediate_float32
 tgsi_build_immediate_float32(
-   GLfloat value,
+   float value,
    struct tgsi_immediate *immediate,
    struct tgsi_header *header );
 
-GLuint
+unsigned
 tgsi_build_full_immediate(
    const struct tgsi_full_immediate *full_imm,
    struct tgsi_token *tokens,
    struct tgsi_header *header,
-   GLuint maxsize );
+   unsigned maxsize );
 
 /*
  * instruction
@@ -109,42 +109,42 @@ tgsi_default_instruction( void );
 
 struct tgsi_instruction
 tgsi_build_instruction(
-   GLuint opcode,
-   GLuint saturate,
-   GLuint num_dst_regs,
-   GLuint num_src_regs,
+   unsigned opcode,
+   unsigned saturate,
+   unsigned num_dst_regs,
+   unsigned num_src_regs,
    struct tgsi_header *header );
 
 struct tgsi_full_instruction
 tgsi_default_full_instruction( void );
 
-GLuint
+unsigned
 tgsi_build_full_instruction(
    const struct tgsi_full_instruction *full_inst,
    struct tgsi_token *tokens,
    struct tgsi_header *header,
-   GLuint maxsize );
+   unsigned maxsize );
 
 struct tgsi_instruction_ext_nv
 tgsi_default_instruction_ext_nv( void );
 
-GLuint
+unsigned
 tgsi_compare_instruction_ext_nv(
    struct tgsi_instruction_ext_nv a,
    struct tgsi_instruction_ext_nv b );
 
 struct tgsi_instruction_ext_nv
 tgsi_build_instruction_ext_nv(
-   GLuint precision,
-   GLuint cond_dst_index,
-   GLuint cond_flow_index,
-   GLuint cond_mask,
-   GLuint cond_swizzle_x,
-   GLuint cond_swizzle_y,
-   GLuint cond_swizzle_z,
-   GLuint cond_swizzle_w,
-   GLuint cond_dst_update,
-   GLuint cond_flow_update,
+   unsigned precision,
+   unsigned cond_dst_index,
+   unsigned cond_flow_index,
+   unsigned cond_mask,
+   unsigned cond_swizzle_x,
+   unsigned cond_swizzle_y,
+   unsigned cond_swizzle_z,
+   unsigned cond_swizzle_w,
+   unsigned cond_dst_update,
+   unsigned cond_flow_update,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -152,15 +152,14 @@ tgsi_build_instruction_ext_nv(
 struct tgsi_instruction_ext_label
 tgsi_default_instruction_ext_label( void );
 
-GLuint
+unsigned
 tgsi_compare_instruction_ext_label(
    struct tgsi_instruction_ext_label a,
    struct tgsi_instruction_ext_label b );
 
 struct tgsi_instruction_ext_label
 tgsi_build_instruction_ext_label(
-   GLuint label,
-   GLuint target,
+   unsigned label,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -168,14 +167,14 @@ tgsi_build_instruction_ext_label(
 struct tgsi_instruction_ext_texture
 tgsi_default_instruction_ext_texture( void );
 
-GLuint
+unsigned
 tgsi_compare_instruction_ext_texture(
    struct tgsi_instruction_ext_texture a,
    struct tgsi_instruction_ext_texture b );
 
 struct tgsi_instruction_ext_texture
 tgsi_build_instruction_ext_texture(
-   GLuint texture,
+   unsigned texture,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -185,15 +184,15 @@ tgsi_default_src_register( void );
 
 struct tgsi_src_register
 tgsi_build_src_register(
-   GLuint file,
-   GLuint swizzle_x,
-   GLuint swizzle_y,
-   GLuint swizzle_z,
-   GLuint swizzle_w,
-   GLuint negate,
-   GLuint indirect,
-   GLuint dimension,
-   GLint index,
+   unsigned file,
+   unsigned swizzle_x,
+   unsigned swizzle_y,
+   unsigned swizzle_z,
+   unsigned swizzle_w,
+   unsigned negate,
+   unsigned indirect,
+   unsigned dimension,
+   int index,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
 
@@ -203,22 +202,22 @@ tgsi_default_full_src_register( void );
 struct tgsi_src_register_ext_swz
 tgsi_default_src_register_ext_swz( void );
 
-GLuint
+unsigned
 tgsi_compare_src_register_ext_swz(
    struct tgsi_src_register_ext_swz a,
    struct tgsi_src_register_ext_swz b );
 
 struct tgsi_src_register_ext_swz
 tgsi_build_src_register_ext_swz(
-   GLuint ext_swizzle_x,
-   GLuint ext_swizzle_y,
-   GLuint ext_swizzle_z,
-   GLuint ext_swizzle_w,
-   GLuint negate_x,
-   GLuint negate_y,
-   GLuint negate_z,
-   GLuint negate_w,
-   GLuint ext_divide,
+   unsigned ext_swizzle_x,
+   unsigned ext_swizzle_y,
+   unsigned ext_swizzle_z,
+   unsigned ext_swizzle_w,
+   unsigned negate_x,
+   unsigned negate_y,
+   unsigned negate_z,
+   unsigned negate_w,
+   unsigned ext_divide,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -226,18 +225,18 @@ tgsi_build_src_register_ext_swz(
 struct tgsi_src_register_ext_mod
 tgsi_default_src_register_ext_mod( void );
 
-GLuint
+unsigned
 tgsi_compare_src_register_ext_mod(
    struct tgsi_src_register_ext_mod a,
    struct tgsi_src_register_ext_mod b );
 
 struct tgsi_src_register_ext_mod
 tgsi_build_src_register_ext_mod(
-   GLuint complement,
-   GLuint bias,
-   GLuint scale_2x,
-   GLuint absolute,
-   GLuint negate,
+   unsigned complement,
+   unsigned bias,
+   unsigned scale_2x,
+   unsigned absolute,
+   unsigned negate,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -247,8 +246,8 @@ tgsi_default_dimension( void );
 
 struct tgsi_dimension
 tgsi_build_dimension(
-   GLuint indirect,
-   GLuint index,
+   unsigned indirect,
+   unsigned index,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
 
@@ -257,9 +256,9 @@ tgsi_default_dst_register( void );
 
 struct tgsi_dst_register
 tgsi_build_dst_register(
-   GLuint file,
-   GLuint mask,
-   GLint index,
+   unsigned file,
+   unsigned mask,
+   int index,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
 
@@ -269,19 +268,19 @@ tgsi_default_full_dst_register( void );
 struct tgsi_dst_register_ext_concode
 tgsi_default_dst_register_ext_concode( void );
 
-GLuint
+unsigned
 tgsi_compare_dst_register_ext_concode(
    struct tgsi_dst_register_ext_concode a,
    struct tgsi_dst_register_ext_concode b );
 
 struct tgsi_dst_register_ext_concode
 tgsi_build_dst_register_ext_concode(
-   GLuint cc,
-   GLuint swizzle_x,
-   GLuint swizzle_y,
-   GLuint swizzle_z,
-   GLuint swizzle_w,
-   GLint index,
+   unsigned cc,
+   unsigned swizzle_x,
+   unsigned swizzle_y,
+   unsigned swizzle_z,
+   unsigned swizzle_w,
+   int index,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );
@@ -289,14 +288,14 @@ tgsi_build_dst_register_ext_concode(
 struct tgsi_dst_register_ext_modulate
 tgsi_default_dst_register_ext_modulate( void );
 
-GLuint
+unsigned
 tgsi_compare_dst_register_ext_modulate(
    struct tgsi_dst_register_ext_modulate a,
    struct tgsi_dst_register_ext_modulate b );
 
 struct tgsi_dst_register_ext_modulate
 tgsi_build_dst_register_ext_modulate(
-   GLuint modulate,
+   unsigned modulate,
    struct tgsi_token *prev_token,
    struct tgsi_instruction *instruction,
    struct tgsi_header *header );