diff options
| author | Marek Olšák <[email protected]> | 2014-09-30 15:56:14 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-10-04 15:16:14 +0200 |
| commit | 8860584045f8c534264f9d456bfafdb545d81437 (patch) | |
| tree | 55231e824d60595252b6d15121de40c8f200bd02 /src/gallium/drivers/radeonsi/si_shader.c | |
| parent | 8908fae243cb4c15a675006a1cc472f6c59b0d43 (diff) | |
radeonsi: get fs_write_all from tgsi_shader_info directly
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 5c3efd4c5f5..e76b969df87 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1438,11 +1438,6 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base) tgsi_parse_token(parse); - if (parse->FullToken.Token.Type == TGSI_TOKEN_TYPE_PROPERTY && - parse->FullToken.FullProperty.Property.PropertyName == - TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS) - shader->fs_write_all = TRUE; - if (parse->FullToken.Token.Type != TGSI_TOKEN_TYPE_DECLARATION) continue; @@ -1499,7 +1494,8 @@ static void si_llvm_emit_fs_epilogue(struct lp_build_tgsi_context * bld_base) memcpy(last_args, args, sizeof(args)); /* Handle FS_COLOR0_WRITES_ALL_CBUFS. */ - if (shader->fs_write_all && shader->output[i].sid == 0 && + if (shader->selector->info.properties[TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS][0] && + shader->output[i].sid == 0 && si_shader_ctx->shader->key.ps.nr_cbufs > 1) { for (int c = 1; c < si_shader_ctx->shader->key.ps.nr_cbufs; c++) { si_llvm_init_export_args_load(bld_base, |