Module: Mesa
Branch: master
Commit: 88a4fd8fe6b47b4685e3fb5e36047d27f764703b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=88a4fd8fe6b47b4685e3fb5e36047d27f764703b
Author: Christian König <deathsim...@vodafone.de>
Date: Wed Aug 29 10:48:01 2012 +0200
radeonsi: stop big offsets from hanging the GPU v2
v2: rebased of radeon/llvm fix.
Signed-off-by: Christian König <deathsim...@vodafone.de>
Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
---
src/gallium/drivers/radeonsi/radeonsi_shader.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c
b/src/gallium/drivers/radeonsi/radeonsi_shader.c
index 9734ab3..8c92149 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_shader.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c
@@ -357,6 +357,7 @@ static LLVMValueRef fetch_constant(
unsigned swizzle)
{
struct lp_build_context * base = &bld_base->base;
+ unsigned idx;
LLVMValueRef const_ptr;
LLVMValueRef offset;
@@ -376,8 +377,14 @@ static LLVMValueRef fetch_constant(
/* XXX: This assumes that the constant buffer is not packed, so
* CONST[0].x will have an offset of 0 and CONST[1].x will have an
* offset of 4. */
- offset = lp_build_const_int32(base->gallivm,
- (reg->Register.Index * 4) + swizzle);
+ idx = (reg->Register.Index * 4) + swizzle;
+
+ /* index loads above 255 are currently not supported */
+ if (idx > 255) {
+ assert(0);
+ idx = 0;
+ }
+ offset = lp_build_const_int32(base->gallivm, idx);
load = build_indexed_load(base->gallivm, const_ptr, offset);
return bitcast(bld_base, type, load);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
