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

Author: Bas Nieuwenhuizen <[email protected]>
Date:   Thu Jul 11 08:44:18 2019 +0200

radv/gfx10: Simplify output mask handling for NGG GS.

We only ever get in this function for a NGG GS proper.

Reviewed-by: Samuel Pitoiset <[email protected]>

---

 src/amd/vulkan/radv_nir_to_llvm.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c 
b/src/amd/vulkan/radv_nir_to_llvm.c
index 490b16a1f25..b5469677d2b 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -3626,18 +3626,7 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct 
radv_shader_context *ctx)
                        outputs[noutput].slot_name = i;
                        outputs[noutput].slot_index = i == 
VARYING_SLOT_CLIP_DIST1;
 
-                       if (ctx->stage == MESA_SHADER_VERTEX &&
-                           !ctx->is_gs_copy_shader) {
-                               outputs[noutput].usage_mask =
-                                       
ctx->shader_info->info.vs.output_usage_mask[i];
-                       } else if (ctx->stage == MESA_SHADER_TESS_EVAL) {
-                               outputs[noutput].usage_mask =
-                                       
ctx->shader_info->info.tes.output_usage_mask[i];
-                       } else {
-                               assert(ctx->is_gs_copy_shader || 
ctx->options->key.vs_common_out.as_ngg);
-                               outputs[noutput].usage_mask =
-                                       
ctx->shader_info->info.gs.output_usage_mask[i];
-                       }
+                       outputs[noutput].usage_mask = 
ctx->shader_info->info.gs.output_usage_mask[i];
 
                        for (unsigned j = 0; j < 4; j++, out_idx++) {
                                gep_idx[2] = LLVMConstInt(ctx->ac.i32, out_idx, 
false);

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to