Mesa (master): radeonsi: use bounded indexing for constant buffers

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: 713353db182dbf5d9be802aa2c1ec7d6debd07a9
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=713353db182dbf5d9be802aa2c1ec7d6debd07a9

Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
Date:   Sun Apr  3 11:39:52 2016 +0200

radeonsi: use bounded indexing for constant buffers

Signed-off-by: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 56c5759..ca2ff4d 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1328,8 +1328,9 @@ static LLVMValueRef fetch_constant(
        if (reg->Register.Dimension && reg->Dimension.Indirect) {
                LLVMValueRef ptr = LLVMGetParam(ctx->radeon_bld.main_fn, 
SI_PARAM_CONST_BUFFERS);
                LLVMValueRef index;
-               index = get_indirect_index(ctx, &reg->DimIndirect,
-                                                  reg->Dimension.Index);
+               index = get_bounded_indirect_index(ctx, &reg->DimIndirect,
+                                                  reg->Dimension.Index,
+                                                  SI_NUM_USER_CONST_BUFFERS);
                bufp = build_indexed_load_const(ctx, ptr, index);
        } else
                bufp = ctx->const_buffers[buf];

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