From: Vinson Lee <vlee@vmware.com>
Date: Sun, 8 Aug 2010 04:01:12 +0000 (-0700)
Subject: swrast: Reduce header file inclusion in s_fragprog.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f009f177fdb891529a4281b2d28f9eb76a365bed;p=mesa.git

swrast: Reduce header file inclusion in s_fragprog.h.

s_fragprog.h
Include mtype.h for GLcontext symbol.
Include s_span.h for SWspan symbol.

s_fragprog.c
Include s_context.h now that it is removed from s_fragprog.h.
---

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index a2c2a10c3de..9facb44d9bf 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -26,6 +26,7 @@
 #include "main/colormac.h"
 #include "program/prog_instruction.h"
 
+#include "s_context.h"
 #include "s_fragprog.h"
 #include "s_span.h"
 
diff --git a/src/mesa/swrast/s_fragprog.h b/src/mesa/swrast/s_fragprog.h
index e1b7e679185..92b9d01e173 100644
--- a/src/mesa/swrast/s_fragprog.h
+++ b/src/mesa/swrast/s_fragprog.h
@@ -27,7 +27,8 @@
 #define S_FRAGPROG_H
 
 
-#include "s_context.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern void