From 333746011d0ac8e7a99587b61fdada3e351b30a3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 27 May 2015 17:22:13 +1000 Subject: [PATCH] draw: add stream member to stats callback This just adds space for the member to the callback, doesn't change anything else. Reviewed-by: Roland Scheidegger Signed-off-by: Dave Airlie --- src/gallium/auxiliary/draw/draw_pt_so_emit.c | 2 +- src/gallium/auxiliary/draw/draw_vbuf.h | 1 + src/gallium/drivers/llvmpipe/lp_setup_vbuf.c | 2 +- src/gallium/drivers/softpipe/sp_prim_vbuf.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_so_emit.c b/src/gallium/auxiliary/draw/draw_pt_so_emit.c index 261bd3467f9..829543cf615 100644 --- a/src/gallium/auxiliary/draw/draw_pt_so_emit.c +++ b/src/gallium/auxiliary/draw/draw_pt_so_emit.c @@ -296,7 +296,7 @@ void draw_pt_so_emit( struct pt_so_emit *emit, } } - render->set_stream_output_info(render, + render->set_stream_output_info(render, 0, emit->emitted_primitives, emit->generated_primitives); } diff --git a/src/gallium/auxiliary/draw/draw_vbuf.h b/src/gallium/auxiliary/draw/draw_vbuf.h index 8faccda556c..6e737ae5b75 100644 --- a/src/gallium/auxiliary/draw/draw_vbuf.h +++ b/src/gallium/auxiliary/draw/draw_vbuf.h @@ -125,6 +125,7 @@ struct vbuf_render { * Called after writing data to the stream out buffers */ void (*set_stream_output_info)( struct vbuf_render *vbufr, + unsigned stream, unsigned primitive_count, unsigned primitive_generated ); diff --git a/src/gallium/drivers/llvmpipe/lp_setup_vbuf.c b/src/gallium/drivers/llvmpipe/lp_setup_vbuf.c index 6675b20168b..17ac61cddb2 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_vbuf.c +++ b/src/gallium/drivers/llvmpipe/lp_setup_vbuf.c @@ -544,7 +544,7 @@ lp_setup_vbuf_destroy(struct vbuf_render *vbr) * increase too should call this from outside streamout code. */ static void -lp_setup_so_info(struct vbuf_render *vbr, uint primitives, uint prim_generated) +lp_setup_so_info(struct vbuf_render *vbr, uint stream, uint primitives, uint prim_generated) { struct lp_setup_context *setup = lp_setup_context(vbr); struct llvmpipe_context *lp = llvmpipe_context(setup->pipe); diff --git a/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c index 1ce04a2f11d..783adf4f448 100644 --- a/src/gallium/drivers/softpipe/sp_prim_vbuf.c +++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.c @@ -597,7 +597,7 @@ sp_vbuf_draw_arrays(struct vbuf_render *vbr, uint start, uint nr) * increase too should call this from outside streamout code. */ static void -sp_vbuf_so_info(struct vbuf_render *vbr, uint primitives, uint prim_generated) +sp_vbuf_so_info(struct vbuf_render *vbr, uint stream, uint primitives, uint prim_generated) { struct softpipe_vbuf_render *cvbr = softpipe_vbuf_render(vbr); struct softpipe_context *softpipe = cvbr->softpipe;