From 12cd89da816336bf40f989f092c62ea473906aac Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 21 Apr 2019 05:11:02 +0000 Subject: [PATCH] panfrost: Disable indirect outputs for now The hardware needs this lowered anyway; for now, might as well use mesa's default lowering for pure conformance reasons. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/midgard/midgard_compile.c | 8 ++++++-- src/gallium/drivers/panfrost/pan_screen.c | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c index 66c8deb4771..0407f028a0d 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c @@ -958,8 +958,10 @@ nir_src_index(compiler_context *ctx, nir_src *src) { if (src->is_ssa) return src->ssa->index; - else + else { + assert(!src->reg.indirect); return ctx->func->impl->ssa_alloc + src->reg.reg->index; + } } static unsigned @@ -967,8 +969,10 @@ nir_dest_index(compiler_context *ctx, nir_dest *dst) { if (dst->is_ssa) return dst->ssa.index; - else + else { + assert(!dst->reg.indirect); return ctx->func->impl->ssa_alloc + dst->reg.reg->index; + } } static unsigned diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index a296c254ef6..5dddb801578 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -320,8 +320,9 @@ panfrost_get_shader_param(struct pipe_screen *screen, return 0; case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR: - case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR: return 1; + case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR: + return 0; case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR: return 0;