diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-19 01:48:39 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-22 01:14:13 +0200 |
| commit | 860b658b97f859ee7d0dd076a8ac0332601ffa65 (patch) | |
| tree | 6598b102fa6a4bfd50d2d7110b5a79bb085b9887 /src/gallium/drivers/radeonsi/si_descriptors.c | |
| parent | 698821bda32eb9958e105c38087b49b6f307128d (diff) | |
| download | external_mesa3d-860b658b97f859ee7d0dd076a8ac0332601ffa65.zip external_mesa3d-860b658b97f859ee7d0dd076a8ac0332601ffa65.tar.gz external_mesa3d-860b658b97f859ee7d0dd076a8ac0332601ffa65.tar.bz2 | |
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>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_descriptors.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 0347944..7be735a 100644 --- 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); |