r600g: fix some warnings

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index f1dc3dc3a96706304c99aa632f2af6d870161f41..16c98504ad9207da48b5eebebbe97f7825c610ab 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -287,7 +287,7 @@ static int r600_bc_tex_build(struct r600_bc *bc, struct r600_bc_tex *tex, unsign
        return 0;
 }
 
-int r600_bc_alu_build(struct r600_bc *bc, struct r600_bc_alu *alu, unsigned id)
+static int r600_bc_alu_build(struct r600_bc *bc, struct r600_bc_alu *alu, unsigned id)
 {
        unsigned i;
 
@@ -331,7 +331,7 @@ int r600_bc_alu_build(struct r600_bc *bc, struct r600_bc_alu *alu, unsigned id)
        return 0;
 }
 
-int r600_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf)
+static int r600_bc_cf_build(struct r600_bc *bc, struct r600_bc_cf *cf)
 {
        unsigned id = cf->id;
 

diff --git a/src/gallium/drivers/r600/r600_draw.c b/src/gallium/drivers/r600/r600_draw.c
index 2420b76318877d44f725fa9adfbf85f7d585e14d..f0584551620dfd96b1013e1b031a95f6976c54a0 100644 (file)
--- a/src/gallium/drivers/r600/r600_draw.c
+++ b/src/gallium/drivers/r600/r600_draw.c
@@ -127,7 +127,7 @@ static int r600_draw_common(struct r600_draw *draw)
        draw->draw->states[R600_DRAW__VGT_NUM_INDICES] = draw->count;
        draw->draw->states[R600_DRAW__VGT_DRAW_INITIATOR] = vgt_draw_initiator;
        if (draw->index_buffer) {
-               rbuffer = (struct r600_buffer*)draw->index_buffer;
+               rbuffer = (struct r600_resource*)draw->index_buffer;
                draw->draw->bo[0] = radeon_bo_incref(rscreen->rw, rbuffer->bo);
                draw->draw->placement[0] = RADEON_GEM_DOMAIN_GTT;
                draw->draw->placement[1] = RADEON_GEM_DOMAIN_GTT;

diff --git a/src/gallium/drivers/r600/r600_screen.h b/src/gallium/drivers/r600/r600_screen.h
index 9a452ecfe3fc86e7a4beed8fc2babf8574ff8f1f..53b560c617f000f1bf5e05dee7e6dedc92964ed2 100644 (file)
--- a/src/gallium/drivers/r600/r600_screen.h
+++ b/src/gallium/drivers/r600/r600_screen.h
@@ -80,4 +80,6 @@ void r600_texture_transfer_unmap(struct pipe_context *ctx,
 int r600_conv_pipe_format(unsigned pformat, unsigned *format);
 int r600_conv_pipe_prim(unsigned pprim, unsigned *prim);
 
+void r600_init_screen_texture_functions(struct pipe_screen *screen);
+
 #endif