radeon/r300: fix warnings

diff --git a/src/mesa/drivers/dri/r300/r300_tex.h b/src/mesa/drivers/dri/r300/r300_tex.h
index c4f42ee621c2532ed7c9f18fe5990043134a695b..baad3fe6c06f85b739f021514a5b448c5d0d689d 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_tex.h
+++ b/src/mesa/drivers/dri/r300/r300_tex.h
@@ -37,6 +37,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern void r300SetDepthTexMode(struct gl_texture_object *tObj);
 
+extern void r300SetTexBuffer(__DRIcontext *pDRICtx, GLint target,
+                            __DRIdrawable *dPriv);
+
 extern void r300SetTexOffset(__DRIcontext *pDRICtx, GLint texname,
                             unsigned long long offset, GLint depth,
                             GLuint pitch);

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 21b94d2e527db75a893790422a0efd13e514634b..086a2683e5ba668b258d8b94be20d36a2ba57b41 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -357,9 +357,6 @@ static const __DRItexOffsetExtension r300texOffsetExtension = {
    r300SetTexOffset,
 };
 
-void r300SetTexBuffer(__DRIcontext *pDRICtx,
-                      GLint target,
-                      __DRIdrawable *dPriv);
 static const __DRItexBufferExtension r300TexBufferExtension = {
     { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
    r300SetTexBuffer,

diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index fe0031e3cdd465c28c19f0b401bc213b67347303..55dda29eaf9c157ba1236b1b1a6fc9e7a9347401 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -31,6 +31,7 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/context.h"
+#include "main/convolve.h"
 #include "main/mipmap.h"
 #include "main/texcompress.h"
 #include "main/texformat.h"