summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/pipe/i915simple/i915_blit.c4
-rw-r--r--src/mesa/pipe/i915simple/i915_fpc_emit.c7
-rw-r--r--src/mesa/pipe/i915simple/i915_prim_emit.c3
-rw-r--r--src/mesa/pipe/i915simple/i915_state_derived.c14
-rw-r--r--src/mesa/pipe/i915simple/i915_state_dynamic.c5
-rw-r--r--src/mesa/pipe/i915simple/i915_tex_layout.c1
-rw-r--r--src/mesa/pipe/i915simple/i915_winsys.h1
7 files changed, 7 insertions, 28 deletions
diff --git a/src/mesa/pipe/i915simple/i915_blit.c b/src/mesa/pipe/i915simple/i915_blit.c
index 5044cf17f7..0a8a1542d7 100644
--- a/src/mesa/pipe/i915simple/i915_blit.c
+++ b/src/mesa/pipe/i915simple/i915_blit.c
@@ -26,10 +26,6 @@
**************************************************************************/
-#include <stdio.h>
-
-//#include "mtypes.h"
-
#include "i915_context.h"
#include "i915_winsys.h"
#include "i915_blit.h"
diff --git a/src/mesa/pipe/i915simple/i915_fpc_emit.c b/src/mesa/pipe/i915simple/i915_fpc_emit.c
index 7259bb503d..26a4f36e71 100644
--- a/src/mesa/pipe/i915simple/i915_fpc_emit.c
+++ b/src/mesa/pipe/i915simple/i915_fpc_emit.c
@@ -25,13 +25,6 @@
*
**************************************************************************/
-#if 0
-#include <strings.h>
-#include "glheader.h"
-#include "macros.h"
-#include "enums.h"
-#endif
-
#include "i915_reg.h"
#include "i915_context.h"
#include "i915_fpc.h"
diff --git a/src/mesa/pipe/i915simple/i915_prim_emit.c b/src/mesa/pipe/i915simple/i915_prim_emit.c
index 5a18d03e50..2c5f11c225 100644
--- a/src/mesa/pipe/i915simple/i915_prim_emit.c
+++ b/src/mesa/pipe/i915simple/i915_prim_emit.c
@@ -26,9 +26,6 @@
**************************************************************************/
-//#include "imports.h"
-//#include "macros.h"
-
#include "pipe/draw/draw_private.h"
#include "pipe/p_util.h"
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/mesa/pipe/i915simple/i915_state_derived.c
index b4ec480f2d..5a493cc9cf 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/mesa/pipe/i915simple/i915_state_derived.c
@@ -25,21 +25,21 @@
*
**************************************************************************/
-#include "main/glheader.h"
-#include "main/macros.h"
-#include "main/enums.h"
-
#include "vf/vf.h"
#include "pipe/draw/draw_context.h"
#include "i915_context.h"
#include "i915_state.h"
+/* XXX should include i915_fpc.h but that causes some trouble atm */
+extern void i915_translate_fragment_program( struct i915_context *i915 );
+
+
-#define EMIT_ATTR( VF_ATTR, FRAG_ATTR, INTERP ) \
-do { \
+#define EMIT_ATTR( VF_ATTR, FRAG_ATTR, INTERP ) \
+do { \
slot_to_vf_attr[nr_attrs] = VF_ATTR; \
nr_attrs++; \
- attr_mask |= (1 << (VF_ATTR)); \
+ attr_mask |= (1 << (VF_ATTR)); \
} while (0)
diff --git a/src/mesa/pipe/i915simple/i915_state_dynamic.c b/src/mesa/pipe/i915simple/i915_state_dynamic.c
index 84bff17b2f..e648357754 100644
--- a/src/mesa/pipe/i915simple/i915_state_dynamic.c
+++ b/src/mesa/pipe/i915simple/i915_state_dynamic.c
@@ -25,11 +25,6 @@
*
**************************************************************************/
-//#include "glheader.h"
-//#include "context.h"
-//#include "macros.h"
-//#include "enums.h"
-
#include "i915_batch.h"
#include "i915_state_inlines.h"
#include "i915_context.h"
diff --git a/src/mesa/pipe/i915simple/i915_tex_layout.c b/src/mesa/pipe/i915simple/i915_tex_layout.c
index ec1fb9532d..39c3cf2f71 100644
--- a/src/mesa/pipe/i915simple/i915_tex_layout.c
+++ b/src/mesa/pipe/i915simple/i915_tex_layout.c
@@ -30,7 +30,6 @@
* Michel Dänzer <michel@tungstengraphics.com>
*/
-//#include "macros.h"
#include "pipe/p_state.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
diff --git a/src/mesa/pipe/i915simple/i915_winsys.h b/src/mesa/pipe/i915simple/i915_winsys.h
index 10a8283035..a95927d803 100644
--- a/src/mesa/pipe/i915simple/i915_winsys.h
+++ b/src/mesa/pipe/i915simple/i915_winsys.h
@@ -28,7 +28,6 @@
#ifndef I915_WINSYS_H
#define I915_WINSYS_H
-//#include "main/mtypes.h"
/* This is the interface that softpipe requires any window system
* hosting it to implement. This is the only include file in softpipe