diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2013-02-04 12:02:18 +0000 |
---|---|---|
committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:42 +0000 |
commit | f0365d40b4e83d13c1865d48e571271737a58c65 (patch) | |
tree | 5bc8d94606f115b9fa4b91c03c08b9336ce8d4ec /assembler/brw_eu.c | |
parent | 2d8b92a24b2d6aebe2ced1f014b6c3129f86b91c (diff) |
assembler: Don't use GL types
sed -i -e 's/GLuint/unsigned/g' -e 's/GLint/int/g' \
-e 's/GLfloat/float/g' -e 's/GLubyte/uint8_t/g' \
-e 's/GLshort/int16_t/g' assembler/*.[ch]
Drop the GL types here, they don't bring anything to the table. For
instance, GLuint has no guarantee to be 32 bits, so it does not make too
much sense to use it in structure describing hardware tables and
opcodes.
Of course, some bikeshedding can be applied to use uin32_t instead, I
figured that some of the GLuint are used without size constraints, so
a sed with uint32_t did not seem the right thing to do. On top of that
initial sed, one bothered enough could change the structures with size
constraints to actually use uint32_t.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'assembler/brw_eu.c')
-rw-r--r-- | assembler/brw_eu.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/assembler/brw_eu.c b/assembler/brw_eu.c index a9afc820..d874b792 100644 --- a/assembler/brw_eu.c +++ b/assembler/brw_eu.c @@ -65,7 +65,7 @@ brw_swap_cmod(uint32_t cmod) /* How does predicate control work when execution_size != 8? Do I * need to test/set for 0xffff when execution_size is 16? */ -void brw_set_predicate_control_flag_value( struct brw_compile *p, GLuint value ) +void brw_set_predicate_control_flag_value( struct brw_compile *p, unsigned value ) { p->current->header.predicate_control = BRW_PREDICATE_NONE; @@ -81,7 +81,7 @@ void brw_set_predicate_control_flag_value( struct brw_compile *p, GLuint value ) } } -void brw_set_predicate_control( struct brw_compile *p, GLuint pc ) +void brw_set_predicate_control( struct brw_compile *p, unsigned pc ) { p->current->header.predicate_control = pc; } @@ -91,7 +91,7 @@ void brw_set_predicate_inverse(struct brw_compile *p, bool predicate_inverse) p->current->header.predicate_inverse = predicate_inverse; } -void brw_set_conditionalmod( struct brw_compile *p, GLuint conditional ) +void brw_set_conditionalmod( struct brw_compile *p, unsigned conditional ) { p->current->header.destreg__conditionalmod = conditional; } @@ -102,7 +102,7 @@ void brw_set_flag_reg(struct brw_compile *p, int reg, int subreg) p->current->bits2.da1.flag_subreg_nr = subreg; } -void brw_set_access_mode( struct brw_compile *p, GLuint access_mode ) +void brw_set_access_mode( struct brw_compile *p, unsigned access_mode ) { p->current->header.access_mode = access_mode; } @@ -144,7 +144,7 @@ brw_set_compression_control(struct brw_compile *p, } } -void brw_set_mask_control( struct brw_compile *p, GLuint value ) +void brw_set_mask_control( struct brw_compile *p, unsigned value ) { p->current->header.mask_control = value; } @@ -154,7 +154,7 @@ void brw_set_saturate( struct brw_compile *p, bool enable ) p->current->header.saturate = enable; } -void brw_set_acc_write_control(struct brw_compile *p, GLuint value) +void brw_set_acc_write_control(struct brw_compile *p, unsigned value) { if (p->brw->intel.gen >= 6) p->current->header.acc_wr_control = value; @@ -219,13 +219,13 @@ brw_init_compile(struct brw_context *brw, struct brw_compile *p, void *mem_ctx) } -const GLuint *brw_get_program( struct brw_compile *p, - GLuint *sz ) +const unsigned *brw_get_program( struct brw_compile *p, + unsigned *sz ) { brw_compact_instructions(p); *sz = p->next_insn_offset; - return (const GLuint *)p->store; + return (const unsigned *)p->store; } void |