summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorJerome Glisse <glisse@freedesktop.org>2006-09-12 18:52:13 +0000
committerJerome Glisse <glisse@freedesktop.org>2006-09-12 18:52:13 +0000
commit323414940fc42760e2af3dd42a061c8c696cb7e9 (patch)
tree7df675eb1e561890c385f458bad981ef1a7a831d /src/mesa/drivers
parent6a65e6db3d9a64cd2b233155a05074a3eb5c1975 (diff)
Fix compilation warning.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/r300/r300_emit.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index d811cd3827..1101a3545a 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -135,9 +135,10 @@ static __inline__ uint32_t cmdpacify(void)
do { \
int _n; \
_n=(num_extra); \
- cmd = r300AllocCmdBuf(rmesa, \
- (_n+2), \
- __FUNCTION__); \
+ cmd = (drm_radeon_cmd_header_t*) \
+ r300AllocCmdBuf(rmesa, \
+ (_n+2), \
+ __func__); \
cmd_reserved=_n+2; \
cmd_written=1; \
cmd[0].i=cmdpacket0((reg), _n+1); \
@@ -169,9 +170,10 @@ static __inline__ uint32_t cmdpacify(void)
do { \
int _n; \
_n = (length); \
- cmd = r300AllocCmdBuf(rmesa, \
- (_n+1), \
- __FUNCTION__); \
+ cmd = (drm_radeon_cmd_header_t*) \
+ r300AllocCmdBuf(rmesa, \
+ (_n+1), \
+ __func__); \
cmd_reserved = _n+2; \
cmd_written =1; \
cmd[0].i = cmdvpu((dest), _n/4); \
@@ -183,9 +185,10 @@ static __inline__ uint32_t cmdpacify(void)
GLuint _p; \
_n = (count); \
_p = (packet); \
- cmd = r300AllocCmdBuf(rmesa, \
- (_n+3), \
- __FUNCTION__); \
+ cmd = (drm_radeon_cmd_header_t*) \
+ r300AllocCmdBuf(rmesa, \
+ (_n+3), \
+ __func__); \
cmd_reserved = _n+3; \
cmd_written = 2; \
if(_n > 0x3fff) { \