From: Marek Olšák <marek.ol...@amd.com>

State trackers must use a user buffer or const_uploader,
or set pipe_resource::flags same as const_uploader->flags.
---
 src/gallium/drivers/radeonsi/si_descriptors.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c 
b/src/gallium/drivers/radeonsi/si_descriptors.c
index 17115e1..b372090 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -1207,20 +1207,26 @@ void si_set_rw_buffer(struct si_context *sctx,
 
 static void si_pipe_set_constant_buffer(struct pipe_context *ctx,
                                        enum pipe_shader_type shader, uint slot,
                                        const struct pipe_constant_buffer 
*input)
 {
        struct si_context *sctx = (struct si_context *)ctx;
 
        if (shader >= SI_NUM_SHADERS)
                return;
 
+       if (slot == 0 && input && input->buffer &&
+           !(r600_resource(input->buffer)->flags & RADEON_FLAG_32BIT)) {
+               assert(!"constant buffer 0 must have a 32-bit VM address, use 
const_uploader");
+               return;
+       }
+
        slot = si_get_constbuf_slot(slot);
        si_set_constant_buffer(sctx, &sctx->const_and_shader_buffers[shader],
                               
si_const_and_shader_buffer_descriptors_idx(shader),
                               slot, input);
 }
 
 void si_get_pipe_constant_buffer(struct si_context *sctx, uint shader,
                                 uint slot, struct pipe_constant_buffer *cbuf)
 {
        cbuf->user_buffer = NULL;
-- 
2.7.4

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to