[80/90] assembler: Don't pollute the library files with gen4asm.h

Commit Message

Lespiau, Damien Feb. 4, 2013, 3:28 p.m. UTC

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 <[e-mail]>
---
 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(-)

Patch

diff --git a/assembler/brw_disasm.c b/assembler/brw_disasm.c
index 8eaeb78..8524d41 100644
--- a/assembler/brw_disasm.c
+++ b/assembler/brw_disasm.c
@@ -27,7 +27,6 @@ 
 #include <unistd.h>
 #include <stdarg.h>
 
-#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 1641c95..69f088d 100644
--- a/assembler/brw_eu.c
+++ b/assembler/brw_eu.c
@@ -32,7 +32,6 @@ 
 
 #include <string.h>
 
-#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 20d4b82..5d623c0 100644
--- a/assembler/brw_eu.h
+++ b/assembler/brw_eu.h
@@ -35,7 +35,6 @@ 
 
 #include <stdbool.h>
 #include <stdio.h>
-#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 e650bf5..2f6aafb 100644
--- a/assembler/brw_structs.h
+++ b/assembler/brw_structs.h
@@ -33,6 +33,14 @@ 
 #ifndef BRW_STRUCTS_H
 #define BRW_STRUCTS_H
 
+#include <stdint.h>
+
+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:
  */