summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/pipe/draw/draw_vertex.h4
-rwxr-xr-xsrc/mesa/pipe/softpipe/sp_quad_fs.c1
-rw-r--r--src/mesa/pipe/softpipe/sp_state_derived.c1
-rw-r--r--src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c1
-rw-r--r--src/mesa/state_tracker/st_cb_feedback.c1
-rw-r--r--src/mesa/state_tracker/st_cb_rasterpos.c1
-rw-r--r--src/mesa/state_tracker/st_draw.c1
7 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index 5874c554b1..5aa0df4e92 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -33,11 +33,11 @@
#ifndef DRAW_VERTEX_H
#define DRAW_VERTEX_H
-#include "pipe/tgsi/exec/tgsi_attribs.h"
+#if 0
#define MAX_VERT_ATTRIBS 12 /* OK? */
-
+#endif
struct draw_context;
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index 7d2712a537..13d7eac4f2 100755
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -34,7 +34,6 @@
#include "pipe/p_util.h"
#include "pipe/p_defines.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "sp_context.h"
#include "sp_headers.h"
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 3ae207910d..b51ab66cf3 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -33,7 +33,6 @@
#include "sp_context.h"
#include "sp_state.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "pipe/tgsi/exec/tgsi_token.h"
diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
index fb8365aab5..2d5114a720 100644
--- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
+++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c
@@ -1,6 +1,5 @@
#include "tgsi_platform.h"
#include "tgsi_mesa.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
#define TGSI_DEBUG 0
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index e846463c4c..78cf4c2b4d 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -54,7 +54,6 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_winsys.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "vf/vf.h"
#include "pipe/draw/draw_context.h"
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 04b2016ffc..56c98916ed 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -44,7 +44,6 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_winsys.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "shader/prog_instruction.h"
#include "vf/vf.h"
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index e6f4175bf8..0f45bf579a 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -47,7 +47,6 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_winsys.h"
-#include "pipe/tgsi/exec/tgsi_attribs.h"
#include "pipe/draw/draw_private.h"
#include "pipe/draw/draw_context.h"