radeonsi: move clip plane constant buffer to RW buffers

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 034794467a606640fcd4e97ae6549e1e230df99a..7be735a0a6846e9aff095cea2dcc7065274b62f8 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -783,9 +783,9 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf
                util_memcpy_cpu_to_le32(tmp, ptr, size);
 }
 
-static void si_set_constant_buffer(struct si_context *sctx,
-                                  struct si_buffer_resources *buffers,
-                                  uint slot, struct pipe_constant_buffer *input)
+void si_set_constant_buffer(struct si_context *sctx,
+                           struct si_buffer_resources *buffers,
+                           uint slot, struct pipe_constant_buffer *input)
 {
        assert(slot < buffers->desc.num_elements);
        pipe_resource_reference(&buffers->buffers[slot], NULL);
@@ -1413,14 +1413,6 @@ void si_emit_graphics_shader_userdata(struct si_context *sctx,
        unsigned i;
        uint32_t *sh_base = sctx->shader_userdata.sh_base;
 
-       if (sctx->gs_shader.cso) {
-               /* The VS copy shader needs this for clipping. */
-               unsigned vs_base = R_00B130_SPI_SHADER_USER_DATA_VS_0;
-               unsigned i = PIPE_SHADER_VERTEX;
-
-               si_emit_shader_pointer(sctx, &sctx->const_buffers[i].desc, vs_base, true);
-       }
-
        if (sctx->rw_buffers.desc.pointer_dirty) {
                si_emit_shader_pointer(sctx, &sctx->rw_buffers.desc,
                                       R_00B030_SPI_SHADER_USER_DATA_PS_0, true);

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index f698c6353939518ae884f8a537cbebe9fd82fad0..fc3e5c0d921e6fec41877b95409ab6f9975eda80 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1690,8 +1690,9 @@ static void si_llvm_emit_clipvertex(struct lp_build_tgsi_context *bld_base,
        unsigned chan;
        unsigned const_chan;
        LLVMValueRef base_elt;
-       LLVMValueRef ptr = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_CONST_BUFFERS);
-       LLVMValueRef constbuf_index = lp_build_const_int32(base->gallivm, SI_DRIVER_STATE_CONST_BUF);
+       LLVMValueRef ptr = LLVMGetParam(ctx->radeon_bld.main_fn, SI_PARAM_RW_BUFFERS);
+       LLVMValueRef constbuf_index = lp_build_const_int32(base->gallivm,
+                                                          SI_VS_CONST_CLIP_PLANES);
        LLVMValueRef const_resource = build_indexed_load_const(ctx, ptr, constbuf_index);
 
        for (reg_index = 0; reg_index < 2; reg_index ++) {

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index e726196d07a3e9c05b9741ff124baa77a67e5311..74af14c217b7df996d0190092b36f1b7fa47550f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -771,7 +771,8 @@ static void si_set_clip_state(struct pipe_context *ctx,
        cb.user_buffer = state->ucp;
        cb.buffer_offset = 0;
        cb.buffer_size = 4*4*8;
-       ctx->set_constant_buffer(ctx, PIPE_SHADER_VERTEX, SI_DRIVER_STATE_CONST_BUF, &cb);
+       si_set_constant_buffer(sctx, &sctx->rw_buffers,
+                              SI_VS_CONST_CLIP_PLANES, &cb);
        pipe_resource_reference(&cb.buffer, NULL);
 }
 

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 9a2a7fd213772bc6bd1c0d64a73ca65b0274b665..b7b00f00ecf9ffb85eece80fdf1d3364ccfd3372 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -178,6 +178,7 @@ enum {
        SI_VS_STREAMOUT_BUF2,
        SI_VS_STREAMOUT_BUF3,
 
+       SI_VS_CONST_CLIP_PLANES,
        SI_PS_CONST_POLY_STIPPLE,
 
        SI_NUM_RW_BUFFERS,
@@ -273,6 +274,9 @@ void si_update_compressed_colortex_masks(struct si_context *sctx);
 void si_emit_graphics_shader_userdata(struct si_context *sctx,
                                       struct r600_atom *atom);
 void si_emit_compute_shader_userdata(struct si_context *sctx);
+void si_set_constant_buffer(struct si_context *sctx,
+                           struct si_buffer_resources *buffers,
+                           uint slot, struct pipe_constant_buffer *input);
 
 /* si_state.c */
 struct si_shader_selector;