diff options
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp index e23141b2dd2..6a3c7e92f8a 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp @@ -1628,13 +1628,20 @@ NVC0LoweringPass::processSurfaceCoordsNVE4(TexInstruction *su) // calculate clamped coordinates for (c = 0; c < arg; ++c) { + int dimc = c; + + if (c == 1 && su->tex.target == TEX_TARGET_1D_ARRAY) { + // The array index is stored in the Z component for 1D arrays. + dimc = 2; + } + src[c] = bld.getScratch(); if (c == 0 && raw) v = loadSuInfo32(NULL, base + NVE4_SU_INFO_RAW_X); else - v = loadSuInfo32(NULL, base + NVE4_SU_INFO_DIM(c)); + v = loadSuInfo32(NULL, base + NVE4_SU_INFO_DIM(dimc)); bld.mkOp3(OP_SUCLAMP, TYPE_S32, src[c], su->getSrc(c), v, zero) - ->subOp = getSuClampSubOp(su, c); + ->subOp = getSuClampSubOp(su, dimc); } for (; c < 3; ++c) src[c] = zero; |