Module: Mesa Branch: main Commit: ed72d6e2a798e7c0a526e900426c41d93798bfec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed72d6e2a798e7c0a526e900426c41d93798bfec
Author: Marcin Ślusarz <[email protected]> Date: Mon Jul 10 13:59:37 2023 +0200 hasvk: remove dead code & comments related to mesh shading Reviewed-by: Ivan Briano <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24071> --- src/intel/vulkan_hasvk/anv_blorp.c | 4 +--- src/intel/vulkan_hasvk/anv_cmd_buffer.c | 5 +---- src/intel/vulkan_hasvk/genX_pipeline.c | 3 --- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_blorp.c b/src/intel/vulkan_hasvk/anv_blorp.c index f2cead534af..ca9ec7cb7ae 100644 --- a/src/intel/vulkan_hasvk/anv_blorp.c +++ b/src/intel/vulkan_hasvk/anv_blorp.c @@ -87,9 +87,7 @@ upload_blorp_shader(struct blorp_batch *batch, uint32_t stage, void anv_device_init_blorp(struct anv_device *device) { - const struct blorp_config config = { - .use_mesh_shading = device->physical->vk.supported_extensions.NV_mesh_shader, - }; + const struct blorp_config config = {}; blorp_init(&device->blorp, device, &device->isl_dev, &config); device->blorp.compiler = device->physical->compiler; diff --git a/src/intel/vulkan_hasvk/anv_cmd_buffer.c b/src/intel/vulkan_hasvk/anv_cmd_buffer.c index 018e13b97be..d78493f6350 100644 --- a/src/intel/vulkan_hasvk/anv_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/anv_cmd_buffer.c @@ -350,10 +350,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, switch (bind_point) { case VK_PIPELINE_BIND_POINT_GRAPHICS: - stages &= VK_SHADER_STAGE_ALL_GRAPHICS | - (cmd_buffer->device->vk.enabled_extensions.NV_mesh_shader ? - (VK_SHADER_STAGE_TASK_BIT_NV | - VK_SHADER_STAGE_MESH_BIT_NV) : 0); + stages &= VK_SHADER_STAGE_ALL_GRAPHICS; pipe_state = &cmd_buffer->state.gfx.base; break; diff --git a/src/intel/vulkan_hasvk/genX_pipeline.c b/src/intel/vulkan_hasvk/genX_pipeline.c index bd13d520686..2e236f694c5 100644 --- a/src/intel/vulkan_hasvk/genX_pipeline.c +++ b/src/intel/vulkan_hasvk/genX_pipeline.c @@ -346,9 +346,6 @@ emit_3dstate_sbe(struct anv_graphics_pipeline *pipeline) struct GENX(3DSTATE_SBE) sbe = { GENX(3DSTATE_SBE_header), - /* TODO(mesh): Figure out cases where we need attribute swizzling. See also - * calculate_urb_setup() and related functions. - */ .AttributeSwizzleEnable = anv_pipeline_is_primitive(pipeline), .PointSpriteTextureCoordinateOrigin = UPPERLEFT, .NumberofSFOutputAttributes = wm_prog_data->num_varying_inputs,
