summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/i915simple/i915_state_emit.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-08-13 16:07:11 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2007-08-13 16:23:44 +0100
commit40a86b20478024ca7c55400019c536cb5ff631d1 (patch)
tree624d3f33b07dfba4328b0c7746af5f58fd496292 /src/mesa/pipe/i915simple/i915_state_emit.c
parentd46779103b38aeab61701759ed7a0b30cc71c0ef (diff)
Start breaking the #include dependencies between pipe drivers and mesa.
Pipe drivers shouldn't really know much about mesa and certainly shouldn't be #including files from src/mesa/main and the like. I've also (in i915simple especially) moved over from GL types to more conventional int/unsigned usage. This probably isn't really the ultimate desired set of types to use - possibly C99 would be better. It may even be that a subset of the GL types is preferable.
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_state_emit.c')
-rw-r--r--src/mesa/pipe/i915simple/i915_state_emit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/pipe/i915simple/i915_state_emit.c b/src/mesa/pipe/i915simple/i915_state_emit.c
index 2ce079fbaa..a7ae92d93c 100644
--- a/src/mesa/pipe/i915simple/i915_state_emit.c
+++ b/src/mesa/pipe/i915simple/i915_state_emit.c
@@ -27,8 +27,8 @@
-#include "glheader.h"
-#include "mtypes.h"
+//#include "glheader.h"
+//#include "mtypes.h"
#include "i915_reg.h"
#include "i915_context.h"
@@ -204,8 +204,8 @@ i915_emit_hardware_state(struct i915_context *i915 )
{
- GLuint i, dwords;
- GLuint *prog = i915_passthrough_program( &dwords );
+ unsigned i, dwords;
+ unsigned *prog = i915_passthrough_program( &dwords );
for (i = 0; i < dwords; i++)
OUT_BATCH( prog[i] );