fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-31 09:10:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

anv: do not get rid of empty/useless fragment shaders

Browse source 
This was an optimization done a while ago that doesn't seem to be having
much of an impact anymore, and on the other hand, causes all sorts of
breakage with queries, as many of our HW counters don't get incremented
when rasterization is disabled.

This fixes a bunch of issues Zink has with ANV, but more importantly, it
fixes upcoming CTS tests:
dEQP-VK.transform_feedback.primitives_generated_query.*.empty_frag.*
dEQP-VK.transform_feedback.primitives_generated_query.*.no_attachment.*
dEQP-VK.transform_feedback.primitives_generated_query.*.color_write_disable_*

Cc: mesa-stable

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17038>
(cherry picked from commit 4666ef720e)

Conflicts:
	src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt

CI file was deleted as it doesn't exist on 22.1
This commit is contained in:
Iván Briano 2022-06-14 12:57:20 -07:00 • committed by Dylan Baker
parent da478e6afa
commit 2fcda40ea4
2 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -616,7 +616,7 @@
"description": "anv: do not get rid of empty/useless fragment shaders",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

40
src/intel/vulkan/anv_pipeline.c
View file

@ -1850,46 +1850,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 =