diff options
Diffstat (limited to 'src/intel/vulkan/anv_pipeline.c')
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 53 |
1 files changed, 8 insertions, 45 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 95bc1fe3c54..9eec762d9d9 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -485,8 +485,8 @@ populate_wm_prog_key(const struct anv_graphics_pipeline *pipeline, assert(rendering_info->colorAttachmentCount <= MAX_RTS); /* Consider all inputs as valid until look at the NIR variables. */ - key->color_outputs_valid = (1u << MAX_RTS) - 1; - key->nr_color_regions = MAX_RTS; + key->color_outputs_valid = (1u << rendering_info->colorAttachmentCount) - 1; + key->nr_color_regions = rendering_info->colorAttachmentCount; /* To reduce possible shader recompilations we would need to know if * there is a SampleMask output variable to compute if we should emit @@ -1116,7 +1116,8 @@ anv_pipeline_compile_mesh(const struct brw_compiler *compiler, static void anv_pipeline_link_fs(const struct brw_compiler *compiler, - struct anv_pipeline_stage *stage) + struct anv_pipeline_stage *stage, + const VkPipelineRenderingCreateInfo *rendering_info) { /* Initially the valid outputs value is set to all possible render targets * valid (see populate_wm_prog_key()), before we look at the shader @@ -1135,6 +1136,8 @@ anv_pipeline_link_fs(const struct brw_compiler *compiler, stage->key.wm.color_outputs_valid |= BITFIELD_RANGE(rt, array_len); } + stage->key.wm.color_outputs_valid &= + (1u << rendering_info->colorAttachmentCount) - 1; stage->key.wm.nr_color_regions = util_last_bit(stage->key.wm.color_outputs_valid); @@ -1680,7 +1683,7 @@ anv_pipeline_compile_graphics(struct anv_graphics_pipeline *pipeline, anv_pipeline_link_mesh(compiler, &stages[s], next_stage); break; case MESA_SHADER_FRAGMENT: - anv_pipeline_link_fs(compiler, &stages[s]); + anv_pipeline_link_fs(compiler, &stages[s], rendering_info); break; default: unreachable("Invalid graphics shader stage"); @@ -1850,46 +1853,6 @@ anv_pipeline_compile_graphics(struct anv_graphics_pipeline *pipeline, done: - if (pipeline->shaders[MESA_SHADER_FRAGMENT] != NULL) { - struct anv_shader_bin *fs = pipeline->shaders[MESA_SHADER_FRAGMENT]; - const struct brw_wm_prog_data *wm_prog_data = - brw_wm_prog_data_const(fs->prog_data); - - if (wm_prog_data->color_outputs_written == 0 && - !wm_prog_data->has_side_effects && - !wm_prog_data->uses_omask && - !wm_prog_data->uses_kill && - wm_prog_data->computed_depth_mode == BRW_PSCDEPTH_OFF && - !wm_prog_data->computed_stencil && - fs->xfb_info == NULL) { - /* This can happen if we decided to implicitly disable the fragment - * shader. See anv_pipeline_compile_fs(). - */ - anv_shader_bin_unref(pipeline->base.device, fs); - pipeline->shaders[MESA_SHADER_FRAGMENT] = NULL; - pipeline->active_stages &= ~VK_SHADER_STAGE_FRAGMENT_BIT; - - /* The per-SIMD size fragment shaders should be last in the - * executables array. Remove all of them. - */ - ASSERTED unsigned removed = 0; - - util_dynarray_foreach_reverse(&pipeline->base.executables, - struct anv_pipeline_executable, - tail) { - /* There must be at least one fragment shader. */ - assert(removed > 0 || tail->stage == MESA_SHADER_FRAGMENT); - - if (tail->stage != MESA_SHADER_FRAGMENT) - break; - - (void) util_dynarray_pop(&pipeline->base.executables, - struct anv_pipeline_executable); - removed++; - } - } - } - pipeline_feedback.duration = os_time_get_nano() - pipeline_start; const VkPipelineCreationFeedbackCreateInfo *create_feedback = @@ -2335,7 +2298,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline, default: unreachable("invalid sample count"); } - if (sl_info) { + if (sl_info && sl_info->sampleLocationsEnable) { const VkSampleLocationEXT *positions = sl_info->sampleLocationsInfo.pSampleLocations; for (uint32_t i = 0; i < samples; i++) { |