summaryrefslogtreecommitdiff
path: root/assembler/gen4asm.h
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2013-02-04 12:02:18 +0000
committerDamien Lespiau <damien.lespiau@intel.com>2013-03-04 15:54:42 +0000
commitf0365d40b4e83d13c1865d48e571271737a58c65 (patch)
tree5bc8d94606f115b9fa4b91c03c08b9336ce8d4ec /assembler/gen4asm.h
parent2d8b92a24b2d6aebe2ced1f014b6c3129f86b91c (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/gen4asm.h')
-rw-r--r--assembler/gen4asm.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/assembler/gen4asm.h b/assembler/gen4asm.h
index a708c526..8bfbcfe0 100644
--- a/assembler/gen4asm.h
+++ b/assembler/gen4asm.h
@@ -35,12 +35,6 @@
#include "brw_reg.h"
-typedef unsigned char GLubyte;
-typedef short GLshort;
-typedef unsigned int GLuint;
-typedef int GLint;
-typedef float GLfloat;
-
extern long int gen_level;
extern int advanced_flag;
extern int errors;
@@ -147,7 +141,7 @@ struct label_instruction {
struct relocation {
char *first_reloc_target, *second_reloc_target; // JIP and UIP respectively
- GLint first_reloc_offset, second_reloc_offset; // in number of instructions
+ int first_reloc_offset, second_reloc_offset; // in number of instructions
};
/**