Module: Mesa
Branch: gallium-resources
Commit: 6f09bf4066ab651b323c131bb07978e700519805
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f09bf4066ab651b323c131bb07978e700519805
Author: Roland Scheidegger <srol...@vmware.com>
Date: Thu Apr 1 00:05:12 2010 +0200
r300g: compile fixes
---
src/gallium/drivers/r300/r300_resource.c | 7 +------
src/gallium/drivers/r300/r300_screen_buffer.c | 2 +-
src/gallium/drivers/r300/r300_state.c | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_resource.c
b/src/gallium/drivers/r300/r300_resource.c
index fe779ef..93746fe 100644
--- a/src/gallium/drivers/r300/r300_resource.c
+++ b/src/gallium/drivers/r300/r300_resource.c
@@ -42,11 +42,6 @@
-
-
-
-
-
static struct pipe_resource *
r300_resource_create(struct pipe_screen *screen,
const struct pipe_resource *template)
@@ -54,7 +49,7 @@ r300_resource_create(struct pipe_screen *screen,
if (template->target == PIPE_BUFFER)
return r300_buffer_create(screen, template);
else
- return r300_resource_create(screen, template);
+ return r300_texture_create(screen, template);
}
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c
b/src/gallium/drivers/r300/r300_screen_buffer.c
index beca877..cb47ba1 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -323,7 +323,7 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen
*screen,
pipe_reference_init(&rbuf->b.b.reference, 1);
rbuf->b.b.screen = screen;
- if (bind & R300_BIND_OQBO)
+ if (rbuf->b.b.bind & R300_BIND_OQBO)
alignment = 4096;
rbuf->buf = r300_winsys_buffer_create(r300screen,
diff --git a/src/gallium/drivers/r300/r300_state.c
b/src/gallium/drivers/r300/r300_state.c
index 6244970..54d22c7 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -1368,7 +1368,7 @@ static void r300_set_constant_buffer(struct pipe_context
*pipe,
} else if (r300->draw) {
draw_set_mapped_constant_buffer(r300->draw, PIPE_SHADER_VERTEX,
0, r300->shader_constants[PIPE_SHADER_VERTEX].constants,
- buf->size);
+ buf->width0);
}
} else if (shader == PIPE_SHADER_FRAGMENT) {
r300->dirty_state |= R300_NEW_FRAGMENT_SHADER_CONSTANTS;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
