From e75faa3e43360995354683987c42e02b5ca16b19 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 31 Jan 2013 14:25:42 +0000 Subject: assembler: Don't pollute the library files with gen4asm.h gen4asm.h is assembler specific while we want the library files to be somewhat of a proper library. This means that we have to redefine the GL* typedefs for brw_structs.h, not using any of thet GL typedef will be for a future commit. Signed-off-by: Damien Lespiau --- assembler/brw_disasm.c | 1 - assembler/brw_eu.c | 1 - assembler/brw_eu.h | 1 - assembler/brw_structs.h | 8 ++++++++ 4 files changed, 8 insertions(+), 3 deletions(-) (limited to 'assembler') diff --git a/assembler/brw_disasm.c b/assembler/brw_disasm.c index 8eaeb78b..8524d410 100644 --- a/assembler/brw_disasm.c +++ b/assembler/brw_disasm.c @@ -27,7 +27,6 @@ #include #include -#include "gen4asm.h" #include "brw_eu.h" const struct opcode_desc opcode_descs[128] = { diff --git a/assembler/brw_eu.c b/assembler/brw_eu.c index 1641c950..69f088df 100644 --- a/assembler/brw_eu.c +++ b/assembler/brw_eu.c @@ -32,7 +32,6 @@ #include -#include "gen4asm.h" #include "brw_context.h" #include "brw_defines.h" #include "brw_eu.h" diff --git a/assembler/brw_eu.h b/assembler/brw_eu.h index 20d4b82e..5d623c04 100644 --- a/assembler/brw_eu.h +++ b/assembler/brw_eu.h @@ -35,7 +35,6 @@ #include #include -#include "gen4asm.h" #include "brw_context.h" #include "brw_structs.h" #include "brw_defines.h" diff --git a/assembler/brw_structs.h b/assembler/brw_structs.h index e650bf51..2f6aafb8 100644 --- a/assembler/brw_structs.h +++ b/assembler/brw_structs.h @@ -33,6 +33,14 @@ #ifndef BRW_STRUCTS_H #define BRW_STRUCTS_H +#include + +typedef unsigned char GLubyte; +typedef short GLshort; +typedef unsigned int GLuint; +typedef int GLint; +typedef float GLfloat; + /* These seem to be passed around as function args, so it works out * better to keep them as #defines: */ -- cgit v1.2.3