diff options
| author | Marek Olšák <[email protected]> | 2019-08-21 00:28:23 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-08-27 16:16:08 -0400 |
| commit | 1426acf9e7ecba1a252b68979f8721b26fc73f44 (patch) | |
| tree | 369129121e9ca13ee3ee328fa455d8a78ebf2198 /src/gallium/drivers/radeonsi/si_shader.c | |
| parent | 2e94cb66933fd7b130011b53b47e0816eb8a76d5 (diff) | |
radeonsi/gfx10: remove incorrect ngg/pos_writes_edgeflag variables
It varies depending on si_shader_key::as_ngg.
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 3b4bed70b2d..c0c45b0bae6 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2975,13 +2975,16 @@ void si_llvm_export_vs(struct si_shader_context *ctx, pos_args[0].out[3] = ctx->ac.f32_1; /* W */ } + bool pos_writes_edgeflag = shader->selector->info.writes_edgeflag && + !shader->key.as_ngg; + /* Write the misc vector (point size, edgeflag, layer, viewport). */ if (shader->selector->info.writes_psize || - shader->selector->pos_writes_edgeflag || + pos_writes_edgeflag || shader->selector->info.writes_viewport_index || shader->selector->info.writes_layer) { pos_args[1].enabled_channels = shader->selector->info.writes_psize | - (shader->selector->pos_writes_edgeflag << 1) | + (pos_writes_edgeflag << 1) | (shader->selector->info.writes_layer << 2); pos_args[1].valid_mask = 0; /* EXEC mask */ @@ -2996,7 +2999,7 @@ void si_llvm_export_vs(struct si_shader_context *ctx, if (shader->selector->info.writes_psize) pos_args[1].out[0] = psize_value; - if (shader->selector->pos_writes_edgeflag) { + if (pos_writes_edgeflag) { /* The output is a float, but the hw expects an integer * with the first bit containing the edge flag. */ edgeflag_value = LLVMBuildFPToUI(ctx->ac.builder, |