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

Author: Jonathan Marek <[email protected]>
Date:   Thu Dec  5 20:58:58 2019 -0500

turnip: fix incorrectly failing assert

pColorBlendState is allowed to be NULL if subpass has >0 color attachments
but they are all unused.

Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>

---

 src/freedreno/vulkan/tu_pipeline.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/freedreno/vulkan/tu_pipeline.c 
b/src/freedreno/vulkan/tu_pipeline.c
index 8be68ab2665..3a17cc76494 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -1934,6 +1934,7 @@ tu_pipeline_builder_init_graphics(
          subpass->depth_stencil_attachment.attachment != VK_ATTACHMENT_UNUSED;
 
       assert(subpass->color_count == 0 ||
+             !create_info->pColorBlendState ||
              subpass->color_count == 
create_info->pColorBlendState->attachmentCount);
       builder->color_attachment_count = subpass->color_count;
       for (uint32_t i = 0; i < subpass->color_count; i++) {

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

Reply via email to