Mesa (master): radv: check that layout isn't NULL in radv_nir_shader_info_pass()

[Samuel Pitoiset]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon May 14 16:04:33 2018 +0200

radv: check that layout isn't NULL in radv_nir_shader_info_pass()

An upcoming patch will run the shader info pass on the
geometry shader just before emitting the GS copy shader.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_shader_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index aa06efc9dc..a436bd7534 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -424,7 +424,7 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
 	struct nir_function *func =
 		(struct nir_function *)exec_list_get_head_const(&nir->functions);
 
-	if (options->layout->dynamic_offset_count)
+	if (options->layout && options->layout->dynamic_offset_count)
 		info->loads_push_constants = true;
 
 	nir_foreach_variable(variable, &nir->inputs)