diff options
| author | Jason Ekstrand <[email protected]> | 2018-01-17 17:10:34 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-01-26 19:53:01 +0000 |
| commit | 70814af14f9a146aa9452dd771c1295d1bc8cfed (patch) | |
| tree | 984f029cee44b511fdac58e3c6a71991ccc4f58d | |
| parent | ca6942c672f5b4e3e9ae32b0c58e796ceea59c08 (diff) | |
anv/pipeline: Don't look at blend state unless we have an attachment
Without this, we may end up dereferencing blend before we check for
binding->index != UINT32_MAX. However, Vulkan allows the blend state to
be NULL so long as you don't have any color attachments. This fixes a
segfault when running The Talos Principal.
Fixes: 12f4e00b69e724a23504b7bd3958fb75dc462950
Cc: [email protected]
Reviewed-by: Alex Smith <[email protected]>
Reviewed-by: Lionel Landwerlin <[email protected]>
(cherry picked from commit c8949e24984266cca3593291c30ea199baef5358)
| -rw-r--r-- | src/intel/vulkan/genX_pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 82fdf206a95..10efe542106 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1351,10 +1351,10 @@ has_color_buffer_write_enabled(const struct anv_pipeline *pipeline, if (binding->set != ANV_DESCRIPTOR_SET_COLOR_ATTACHMENTS) continue; - const VkPipelineColorBlendAttachmentState *a = - &blend->pAttachments[binding->index]; + if (binding->index == UINT32_MAX) + continue; - if (binding->index != UINT32_MAX && a->colorWriteMask != 0) + if (blend->pAttachments[binding->index].colorWriteMask != 0) return true; } |