diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-13 00:59:38 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-13 17:26:41 +0200 |
| commit | 0b8170103c8eaff46b75e89608198b3eb564bc52 (patch) | |
| tree | 363b7d151dd5f5175e4448809c9b3d27ba2f324f /src/gallium/drivers/nv50/nv50_tgsi_to_nc.c | |
| parent | 3b3c20744f2ea90f6aaae33b337bdc5e135f3198 (diff) | |
nv50: fix indirect CONST access with large or negative offsets
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_tgsi_to_nc.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_tgsi_to_nc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c index 54d6fb960f..a2b6901c81 100644 --- a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c +++ b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c @@ -665,6 +665,7 @@ bld_get_address(struct bld_context *bld, int id, struct nv_value *indirect) { int i; struct nv_instruction *nvi; + struct nv_value *val; for (i = 0; i < 4; ++i) { if (!bld->saved_addr[i][0]) @@ -677,7 +678,13 @@ bld_get_address(struct bld_context *bld, int id, struct nv_value *indirect) } i &= 3; - bld->saved_addr[i][0] = bld_load_imm_u32(bld, id); + val = bld_imm_u32(bld, id); + if (indirect) + val = bld_insn_2(bld, NV_OP_ADD, indirect, val); + else + val = bld_insn_1(bld, NV_OP_MOV, val); + + bld->saved_addr[i][0] = val; bld->saved_addr[i][0]->reg.file = NV_FILE_ADDR; bld->saved_addr[i][0]->reg.type = NV_TYPE_U16; bld->saved_addr[i][1] = indirect; |