small cleanup, remove some warnings

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 8b022067f268eca717045516e6c84e87152381ba..e8e044eab1c199688b1b41d917dcb756be824425 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -370,7 +370,7 @@ void r300Flush(GLcontext * ctx)
 
 void r300RefillCurrentDmaRegion(r300ContextPtr rmesa)
 {
-       struct r200_dma_buffer *dmabuf;
+       struct r300_dma_buffer *dmabuf;
        int fd = rmesa->radeon.dri.fd;
        int index = 0;
        int size = 0;

diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index 7d840f344f6d95e93899ccdec49af70fe4fed79f..e4ea676119f419ee038326246a7f51b42a721e35 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -48,6 +48,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_ioctl.h"
 #include "r300_state.h"
 #include "r300_maos.h"
+#include "r300_ioctl.h"
 
 #define DEBUG_ALL DEBUG_VERTS
 

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index f7e3f7ae13c44dd5963cd0b306001fab610a92e7..b66fa3fbd0e0d712e4036019788bb0857c1ba834 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -55,7 +55,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_reg.h"
 #include "r300_program.h"
 #include "r300_tex.h"
-
+#include "r300_maos.h"
 #include "r300_emit.h"
 
 /* Turns out we might not need this after all... */

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 94324b339d1782dad0d9e1320a6b389bbc6dc80e..2c42ee134b7781907ede8d3fe7b74e7fbe9c1657 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -59,7 +59,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r300_program.h"
 #include "r300_emit.h"
 #include "r300_fixed_pipelines.h"
-
+#include "r300_tex.h"
+#include "r300_maos.h"
 
 static void r300AlphaFunc(GLcontext * ctx, GLenum func, GLfloat ref)
 {

diff --git a/src/mesa/drivers/dri/r300/r300_tex.h b/src/mesa/drivers/dri/r300/r300_tex.h
index 38dd1bbbe55ae185a0a75fad6cd270790ea5c9b2..a18ff0e2ce7baf15db22f27c655ad7f72e64c55c 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_tex.h
+++ b/src/mesa/drivers/dri/r300/r300_tex.h
@@ -47,7 +47,5 @@ extern void r300DestroyTexObj(r300ContextPtr rmesa, r300TexObjPtr t);
 
 extern void r300InitTextureFuncs(struct dd_function_table *functions);
 
-extern void r300UpdateTextureState(GLcontext * ctx);
-
 #endif
 #endif                         /* __r300_TEX_H__ */

diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index 3cfa4793ebe602ab2825942821bff6d601236502..b32812e4f82ccbb40f3c21c121188facfe617328 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -53,7 +53,7 @@ SOFTWARE.
 #include "r300_swtcl.h"
 */
 #include "r300_tex.h"
-
+#include "r300_ioctl.h"
 #include <unistd.h>            /* for usleep() */
 
 /**