Mesa (master): r300g: fixup for GS additions

Dave Airlie airlied at kemper.freedesktop.org
Fri Dec 25 13:29:02 PST 2009


Module: Mesa
Branch: master
Commit: 5676082d28d1d0cbb70b6526d1a7c650a3d28336
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5676082d28d1d0cbb70b6526d1a7c650a3d28336

Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Dec 26 07:28:21 2009 +1000

r300g: fixup for GS additions

draw_set_mapped_constant_buffer changed API

---

 src/gallium/drivers/r300/r300_render.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 2d70ec2..82089f9 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -335,8 +335,9 @@ boolean r300_swtcl_draw_arrays(struct pipe_context* pipe,
     draw_set_mapped_element_buffer(r300->draw, 0, NULL);
 
     draw_set_mapped_constant_buffer(r300->draw,
-            r300->shader_constants[PIPE_SHADER_VERTEX].constants,
-            r300->shader_constants[PIPE_SHADER_VERTEX].count *
+				    PIPE_SHADER_VERTEX,
+				    r300->shader_constants[PIPE_SHADER_VERTEX].constants,
+				    r300->shader_constants[PIPE_SHADER_VERTEX].count *
                 (sizeof(float) * 4));
 
     draw_arrays(r300->draw, mode, start, count);
@@ -383,6 +384,7 @@ boolean r300_swtcl_draw_range_elements(struct pipe_context* pipe,
                                          minIndex, maxIndex, indices);
 
     draw_set_mapped_constant_buffer(r300->draw,
+				    PIPE_SHADER_VERTEX,
             r300->shader_constants[PIPE_SHADER_VERTEX].constants,
             r300->shader_constants[PIPE_SHADER_VERTEX].count *
                 (sizeof(float) * 4));



More information about the mesa-commit mailing list