From: Dave Airlie <airlied@redhat.com>
Date: Mon, 19 Mar 2018 20:02:58 +0000 (+0000)
Subject: radv: don't export NULL layer.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32791a05024d54736eab21379e849480fea78559;p=mesa.git

radv: don't export NULL layer.

We have some cases where in subpass we want the layer but having
it be 0 and loaded in the frag shader without the vertex shader
exporting it is fine.

So don't export the layer if we don't have a value to put in it.

Fixes: d4c74aed7a8 (radv/multiview: mark layer_input if we have input attachments.)
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 7379f348d84..ad046adfdb9 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -2363,7 +2363,7 @@ handle_vs_outputs_post(struct radv_shader_context *ctx,
 		outinfo->export_prim_id = true;
 	}
 
-	if (export_layer_id) {
+	if (export_layer_id && layer_value) {
 		LLVMValueRef values[4];
 
 		values[0] = layer_value;