From 8eeef423e9d4f0c9e7ac6393288b8772d5c62190 Mon Sep 17 00:00:00 2001 From: Rune Petersen Date: Wed, 16 Feb 2005 16:52:11 +0000 Subject: [PATCH] small cleanup, remove some warnings --- src/mesa/drivers/dri/r300/r300_ioctl.c | 2 +- src/mesa/drivers/dri/r300/r300_maos.c | 1 + src/mesa/drivers/dri/r300/r300_render.c | 2 +- src/mesa/drivers/dri/r300/r300_state.c | 3 ++- src/mesa/drivers/dri/r300/r300_tex.h | 2 -- src/mesa/drivers/dri/r300/r300_texmem.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index 8b022067f26..e8e044eab1c 100644 --- 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 7d840f344f6..e4ea676119f 100644 --- 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 f7e3f7ae13c..b66fa3fbd0e 100644 --- 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 94324b339d1..2c42ee134b7 100644 --- 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 38dd1bbbe55..a18ff0e2ce7 100644 --- 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 3cfa4793ebe..b32812e4f82 100644 --- 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 /* for usleep() */ /** -- 2.30.2