Mesa (radeon-rewrite): radeon/r300: fix warnings
Dave Airlie
airlied at kemper.freedesktop.org
Fri Feb 13 21:49:58 UTC 2009
Module: Mesa
Branch: radeon-rewrite
Commit: c0ae4d3c55a606ede41399e39e5221b1955ecc22
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0ae4d3c55a606ede41399e39e5221b1955ecc22
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Feb 14 07:49:15 2009 +1000
radeon/r300: fix warnings
---
src/mesa/drivers/dri/r300/r300_tex.h | 3 +++
src/mesa/drivers/dri/radeon/radeon_screen.c | 3 ---
src/mesa/drivers/dri/radeon/radeon_texture.c | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/r300_tex.h b/src/mesa/drivers/dri/r300/r300_tex.h
index c4f42ee..baad3fe 100644
--- 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 21b94d2..086a268 100644
--- 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 fe0031e..55dda29 100644
--- 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"
More information about the mesa-commit
mailing list