swrast: Clean up header file inclusion in s_atifragshader.h.

s_atifragshader.h
Include mtypes.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

s_atifragshader.c
Include s_context.h for SWcontext symbol.

diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c
index 336415d57af3154bc15564989fc01a7bc61d9b9c..1338b6802d4285f8289ee842bc4a33cf4af37828 100644 (file)
--- a/src/mesa/swrast/s_atifragshader.c
+++ b/src/mesa/swrast/s_atifragshader.c
@@ -24,6 +24,7 @@
 #include "main/macros.h"
 #include "main/atifragshader.h"
 #include "swrast/s_atifragshader.h"
+#include "swrast/s_context.h"
 
 
 /**

diff --git a/src/mesa/swrast/s_atifragshader.h b/src/mesa/swrast/s_atifragshader.h
index 871a0c04559fe90fccdf59356fd7b115a35a6668..cce455a04654ff68100e6fc54d417d29fc2cff20 100644 (file)
--- a/src/mesa/swrast/s_atifragshader.h
+++ b/src/mesa/swrast/s_atifragshader.h
@@ -27,7 +27,8 @@
 #define S_ATIFRAGSHADER_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void