6 files changed, 11 insertions, 1 deletions

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index b2d7f6da30e..22025157764 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -744,6 +744,7 @@ void r300_plug_in_stencil_ref_fallback(struct r300_context *r300);
 void r500_emit_index_bias(struct r300_context *r300, int index_bias);
 void r300_blitter_draw_rectangle(struct blitter_context *blitter,
                                  void *vertex_elements_cso,
+                                 blitter_get_vs_func get_vs,
                                  int x1, int y1, int x2, int y2,
                                  float depth, unsigned num_instances,
                                  enum blitter_attrib_type type,
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 7808669e253..4cae7660347 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -1114,6 +1114,7 @@ struct draw_stage* r300_draw_stage(struct r300_context* r300)
  * somewhat inefficient. Instead we use a rectangular point sprite. */
 void r300_blitter_draw_rectangle(struct blitter_context *blitter,
                                  void *vertex_elements_cso,
+                                 blitter_get_vs_func get_vs,
                                  int x1, int y1, int x2, int y2,
                                  float depth, unsigned num_instances,
                                  enum blitter_attrib_type type,
@@ -1135,7 +1136,8 @@ void r300_blitter_draw_rectangle(struct blitter_context *blitter,
     if ((!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) ||
         type == UTIL_BLITTER_ATTRIB_TEXCOORD_XYZW ||
         num_instances > 1) {
-        util_blitter_draw_rectangle(blitter, vertex_elements_cso, x1, y1, x2, y2,
+        util_blitter_draw_rectangle(blitter, vertex_elements_cso, get_vs,
+                                    x1, y1, x2, y2,
                                     depth, num_instances, type, attrib);
         return;
     }
@@ -1144,6 +1146,7 @@ void r300_blitter_draw_rectangle(struct blitter_context *blitter,
         return;
 
     r300->context.bind_vertex_elements_state(&r300->context, vertex_elements_cso);
+    r300->context.bind_vs_state(&r300->context, get_vs(blitter));
 
     if (type == UTIL_BLITTER_ATTRIB_TEXCOORD_XY)
         r300->sprite_coord_enable = 1;
diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 0e8a12a1b64..56297cf4db8 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -212,6 +212,7 @@ void r600_gfx_wait_fence(struct r600_common_context *ctx,
 
 void r600_draw_rectangle(struct blitter_context *blitter,
 			 void *vertex_elements_cso,
+			 blitter_get_vs_func get_vs,
 			 int x1, int y1, int x2, int y2,
 			 float depth, unsigned num_instances,
 			 enum blitter_attrib_type type,
@@ -225,6 +226,7 @@ void r600_draw_rectangle(struct blitter_context *blitter,
 	float *vb;
 
 	rctx->b.bind_vertex_elements_state(&rctx->b, vertex_elements_cso);
+	rctx->b.bind_vs_state(&rctx->b, get_vs(blitter));
 
 	/* Some operations (like color resolve on r6xx) don't work
 	 * with the conventional primitive types.
diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h
index 37dcbd3d316..52f39cdb7ac 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.h
+++ b/src/gallium/drivers/r600/r600_pipe_common.h
@@ -763,6 +763,7 @@ void r600_gfx_wait_fence(struct r600_common_context *ctx,
 			 uint64_t va, uint32_t ref, uint32_t mask);
 void r600_draw_rectangle(struct blitter_context *blitter,
 			 void *vertex_elements_cso,
+			 blitter_get_vs_func get_vs,
 			 int x1, int y1, int x2, int y2,
 			 float depth, unsigned num_instances,
 			 enum blitter_attrib_type type,
diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index c9745a58cb7..9cc323dc9be 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -409,6 +409,7 @@ void si_emit_cache_flush(struct si_context *sctx);
 void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo);
 void si_draw_rectangle(struct blitter_context *blitter,
 		       void *vertex_elements_cso,
+		       blitter_get_vs_func get_vs,
 		       int x1, int y1, int x2, int y2,
 		       float depth, unsigned num_instances,
 		       enum blitter_attrib_type type,
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index ceb90d287f5..9cb42741153 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -1492,6 +1492,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 
 void si_draw_rectangle(struct blitter_context *blitter,
 		       void *vertex_elements_cso,
+		       blitter_get_vs_func get_vs,
 		       int x1, int y1, int x2, int y2,
 		       float depth, unsigned num_instances,
 		       enum blitter_attrib_type type,
@@ -1565,6 +1566,7 @@ void si_draw_rectangle(struct blitter_context *blitter,
 	vbuffer.buffer_offset = offset;
 
 	pipe->set_vertex_buffers(pipe, blitter->vb_slot, 1, &vbuffer);
+	pipe->bind_vs_state(pipe, get_vs(blitter));
 
 	if (sctx->vertex_elements != vertex_elements_cso)
 		pipe->bind_vertex_elements_state(pipe, vertex_elements_cso);