more comprehensively handle maxColorAttachments < 8

and remove the abort() this time ref #14
zmike · Jan 11, 2023 · 5ae3a31 · 5ae3a31
1 parent e0242a8
commit 5ae3a31
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/pipeline.c b/src/pipeline.c
@@ -257,7 +257,7 @@ create_multirt_pipeline(VkRenderPass render_pass, VkPipelineLayout layout)
       create_shader_module(multirt_frag_spirv, multirt_frag_spirv_len),
    };
 
-   return create_pipeline_helper(layout, render_pass, modules, 8);
+   return create_pipeline_helper(layout, render_pass, modules, dev->info.props.limits.maxColorAttachments == 8 ? 8 : 4);
 }
 
 VkPipeline

diff --git a/src/renderpass.c b/src/renderpass.c
@@ -32,11 +32,6 @@ create_renderpass(unsigned num_rts, bool clear)
    VkPipelineStageFlags dep_pipeline = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
    VkAccessFlags dep_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
 
-   if (dev->info.props.limits.maxColorAttachments < 8) {
-      fprintf(stderr, "maxColorAttachments >= 8 required!\n");
-      abort();
-   }
-
    for (unsigned i = 0; i < MAX_RTS; i++) {
       attachment[i].sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2;
       attachment[i].format = VK_FORMAT_R32G32B32A32_SFLOAT;

diff --git a/src/vkoverhead.c b/src/vkoverhead.c
@@ -2887,7 +2887,7 @@ main(int argc, char *argv[])
    parse_args(argc, (const char**)argv);
    util_cpu_detect();
    dev = vk_device_create();
-   max_rts = MIN2(dev->info.props.limits.maxColorAttachments, 8);
+   max_rts = dev->info.props.limits.maxColorAttachments == 8 ? 8 : 4;
    init_cmdbufs();
    render_pass_clear = create_renderpass(1, true);
    render_pass_dontcare = create_renderpass(1, false);