Mesa (master): r300-gallium: Fix a handful of compile warnings.
Corbin Simpson
csimpson at kemper.freedesktop.org
Mon Feb 23 12:39:05 UTC 2009
Module: Mesa
Branch: master
Commit: b003b2f6dd4ddba45910560ab6d495fb01b5301b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b003b2f6dd4ddba45910560ab6d495fb01b5301b
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Mon Feb 23 04:36:41 2009 -0800
r300-gallium: Fix a handful of compile warnings.
Some harmless, some very dangerous.
---
src/gallium/drivers/r300/r300_context.h | 1 +
src/gallium/drivers/r300/r300_state_derived.c | 8 +++++++-
src/gallium/drivers/r300/r300_swtcl_emit.c | 10 +++++-----
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 5bcf23e..aaab1dd 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -250,6 +250,7 @@ static struct r300_context* r300_context(struct pipe_context* context) {
}
/* Context initialization. */
+struct draw_stage* r300_draw_swtcl_stage(struct r300_context* r300);
void r300_init_state_functions(struct r300_context* r300);
void r300_init_surface_functions(struct r300_context* r300);
diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c
index 2d611b9..a519040 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -40,7 +40,13 @@ static uint32_t translate_vertex_data_type(int type) {
case EMIT_4F:
return R300_DATA_TYPE_FLOAT_4;
break;
+ default:
+ debug_printf("r300: Implementation error: "
+ "Bad vertex data type!\n");
+ break;
}
+
+ return 0;
}
/* Update the vertex_info struct in our r300_context.
@@ -98,7 +104,7 @@ static void r300_update_vertex_layout(struct r300_context* r300)
vinfo.hwfmt[0] = 0x5555; /* XXX this is classic Mesa bonghits */
if (!pos) {
- debug_printf("r300: Forcing vertex position attribute emit...");
+ debug_printf("r300: Forcing vertex position attribute emit...\n");
}
draw_emit_vertex_attr(&vinfo, EMIT_4F, INTERP_POS,
diff --git a/src/gallium/drivers/r300/r300_swtcl_emit.c b/src/gallium/drivers/r300/r300_swtcl_emit.c
index 3ce1837..1ae69e7 100644
--- a/src/gallium/drivers/r300/r300_swtcl_emit.c
+++ b/src/gallium/drivers/r300/r300_swtcl_emit.c
@@ -78,7 +78,7 @@ static boolean r300_swtcl_render_allocate_vertices(struct vbuf_render* render,
size_t size = (size_t)vertex_size * (size_t)count;
if (r300render->vbo) {
- pipe_buffer_reference(screen, r300render->vbo, NULL);
+ pipe_buffer_reference(screen, &r300render->vbo, NULL);
}
r300render->vbo_size = MAX2(size, r300render->vbo_alloc_size);
@@ -108,9 +108,9 @@ static void* r300_swtcl_render_map_vertices(struct vbuf_render* render)
return (unsigned char*)r300render->vbo_map + r300render->vbo_offset;
}
-static void* r300_swtcl_render_unmap_vertices(struct vbuf_render* render,
- ushort min,
- ushort max)
+static void r300_swtcl_render_unmap_vertices(struct vbuf_render* render,
+ ushort min,
+ ushort max)
{
struct r300_swtcl_render* r300render = r300_swtcl_render(render);
struct pipe_screen* screen = r300render->r300->context.screen;
@@ -126,7 +126,7 @@ static void r300_swtcl_render_release_vertices(struct vbuf_render* render)
struct r300_swtcl_render* r300render = r300_swtcl_render(render);
struct pipe_screen* screen = r300render->r300->context.screen;
- pipe_buffer_reference(screen, r300render->vbo, NULL);
+ pipe_buffer_reference(screen, &r300render->vbo, NULL);
}
static boolean r300_swtcl_render_set_primitive(struct vbuf_render* render,
More information about the mesa-commit
mailing list