Mesa (master): radeonsi: enable indirect adressing

[Christian König]

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

Author: Christian König <christian.koenig at amd.com>
Date:   Thu Mar  7 12:00:18 2013 +0100

radeonsi: enable indirect adressing

Fixing 16 piglit tests.

Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |    2 +-
 src/gallium/drivers/radeonsi/radeonsi_shader.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index acf3e2d..2abfce4 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -469,7 +469,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
 	case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
 	case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
 	case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
-		return 0;
+		return 1;
 	case PIPE_SHADER_CAP_INTEGERS:
 		return 1;
 	case PIPE_SHADER_CAP_SUBROUTINES:
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c
index 589bd82..110bfb0 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_shader.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c
@@ -996,11 +996,6 @@ int si_pipe_shader_create(
 	bld_base = &si_shader_ctx.radeon_bld.soa.bld_base;
 
 	tgsi_scan_shader(sel->tokens, &shader_info);
-	if (shader_info.indirect_files != 0) {
-		fprintf(stderr, "Indirect addressing not fully handled yet\n");
-		return -ENOSYS;
-	}
-
 	shader->shader.uses_kill = shader_info.uses_kill;
 	bld_base->info = &shader_info;
 	bld_base->emit_fetch_funcs[TGSI_FILE_CONSTANT] = fetch_constant;