summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-02-14 07:49:15 +1000
committerDave Airlie <airlied@linux.ie>2009-02-14 07:49:15 +1000
commitc0ae4d3c55a606ede41399e39e5221b1955ecc22 (patch)
treee702fe8eed4fa8c7a86a986b039cbc8a58b0799d /src/mesa/drivers/dri
parentcd4e37c8fb7c03e8331a9487d46043eea70fea31 (diff)
radeon/r300: fix warnings
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/r300/r300_tex.h3
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_screen.c3
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_texture.c1
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 c4f42ee621..baad3fe6c0 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 21b94d2e52..086a2683e5 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 fe0031e3cd..55dda29eaf 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"