Mesa (master): swrast: Reduce header file inclusion in s_fragprog.h.

[Vinson Lee]

Module: Mesa
Branch: master
Commit: f009f177fdb891529a4281b2d28f9eb76a365bed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f009f177fdb891529a4281b2d28f9eb76a365bed

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Aug  7 21:01:12 2010 -0700

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.

---

 src/mesa/swrast/s_fragprog.c |    1 +
 src/mesa/swrast/s_fragprog.h |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index a2c2a10..9facb44 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 e1b7e67..92b9d01 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