From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 17 Nov 2015 06:28:52 +0000 (-0800)
Subject: anv/pipeline: Only apply a pipeline layout if we have one
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cd75ff5d1749b9a982546b54cd2655930d2a5402;p=mesa.git

anv/pipeline: Only apply a pipeline layout if we have one
---

diff --git a/src/vulkan/anv_pipeline.c b/src/vulkan/anv_pipeline.c
index 948e675d091..821f5e33774 100644
--- a/src/vulkan/anv_pipeline.c
+++ b/src/vulkan/anv_pipeline.c
@@ -338,7 +338,8 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
    anv_nir_apply_dynamic_offsets(pipeline, nir, prog_data);
 
    /* Apply the actual pipeline layout to UBOs, SSBOs, and textures */
-   anv_nir_apply_pipeline_layout(nir, pipeline->layout);
+   if (pipeline->layout)
+      anv_nir_apply_pipeline_layout(nir, pipeline->layout);
 
    /* All binding table offsets provided by apply_pipeline_layout() are
     * relative to the start of the bindint table (plus MAX_RTS for VS).