From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Wed, 9 May 2007 18:37:46 +0000 (+0000)
Subject: r300: Don't need to include the deprecated r300_program.h in some files.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff7a41a159099f92248c6560140d1b947c0e8cc5;p=mesa.git

r300: Don't need to include the deprecated r300_program.h in some files.

The only file that still requires r300_program.h is r300_ioctl.c; and it should
use the new defines in r300_reg.h!
---

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 1dac3142ee6..e459cad65ac 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -67,7 +67,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_ioctl.h"
 #include "r300_state.h"
 #include "r300_reg.h"
-#include "r300_program.h"
 #include "r300_tex.h"
 #include "r300_maos.h"
 #include "r300_emit.h"
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index a173ff298a8..9f391a27a09 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -58,7 +58,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_ioctl.h"
 #include "r300_state.h"
 #include "r300_reg.h"
-#include "r300_program.h"
 #include "r300_emit.h"
 #include "r300_fragprog.h"
 #include "r300_tex.h"
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 8b1143758e8..90f18ad2257 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -39,7 +39,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/tnl.h"
 
 #include "r300_context.h"
-#include "r300_program.h"
 
 #if SWIZZLE_X != VSF_IN_COMPONENT_X || \
     SWIZZLE_Y != VSF_IN_COMPONENT_Y || \