Module: Mesa Branch: main Commit: 7984c5884c8b29234d6fbd0c56c6987d99a62f78 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7984c5884c8b29234d6fbd0c56c6987d99a62f78
Author: Erik Faye-Lund <[email protected]> Date: Mon Mar 14 09:36:29 2022 +0100 gallium: rename group-vote cap This cap is no longer TGSI specific, so let's rename it to reflect reality. Because the name got a bit vague when removing the TGSI-bits, let's add some more details to the name. Reviewed-by: Adam Jackson <[email protected]> Acked-by: Ian Romanick <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15316> --- docs/gallium/screen.rst | 3 ++- src/gallium/auxiliary/util/u_screen.c | 2 +- src/gallium/drivers/crocus/crocus_screen.c | 2 +- src/gallium/drivers/iris/iris_screen.c | 2 +- src/gallium/drivers/llvmpipe/lp_screen.c | 2 +- src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +- src/gallium/drivers/radeonsi/si_get.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- src/gallium/include/pipe/p_defines.h | 2 +- src/mesa/state_tracker/st_extensions.c | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index 88a0452ba8c..8afb573c8e3 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -378,7 +378,8 @@ The integer capabilities: VARYING_SLOT_CULL_DIST0 slot variables. * ``PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES``: Whether primitive restart is supported for patch primitives. -* ``PIPE_CAP_TGSI_VOTE``: Whether the ``VOTE_*`` ops can be used in shaders. +* ``PIPE_CAP_SHADER_GROUP_VOTE``: Whether the ``VOTE_*`` ops can be used in + shaders. * ``PIPE_CAP_MAX_WINDOW_RECTANGLES``: The maxium number of window rectangles supported in ``set_window_rectangles``. * ``PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED``: If true, the driver implements support diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c index 7e40e1f197a..6f6352e7a5e 100644 --- a/src/gallium/auxiliary/util/u_screen.c +++ b/src/gallium/auxiliary/util/u_screen.c @@ -276,7 +276,7 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: case PIPE_CAP_CULL_DISTANCE: case PIPE_CAP_CULL_DISTANCE_NOCOMBINE: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_MAX_WINDOW_RECTANGLES: /* Enables EXT_window_rectangles */ case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c index 0a2da9aab49..84366a46196 100644 --- a/src/gallium/drivers/crocus/crocus_screen.c +++ b/src/gallium/drivers/crocus/crocus_screen.c @@ -183,7 +183,7 @@ crocus_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_TEX_TXF_LZ: case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: case PIPE_CAP_CLEAR_TEXTURE: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: case PIPE_CAP_TEXTURE_GATHER_SM5: case PIPE_CAP_SHADER_ARRAY_COMPONENTS: diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c index b3df2334de2..268f85413f8 100644 --- a/src/gallium/drivers/iris/iris_screen.c +++ b/src/gallium/drivers/iris/iris_screen.c @@ -225,7 +225,7 @@ iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: case PIPE_CAP_CLEAR_TEXTURE: case PIPE_CAP_CLEAR_SCISSORED: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: case PIPE_CAP_TEXTURE_GATHER_SM5: case PIPE_CAP_SHADER_ARRAY_COMPONENTS: diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 0f62c32532d..88214a178c8 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -355,7 +355,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) #endif case PIPE_CAP_SAMPLER_REDUCTION_MINMAX: case PIPE_CAP_TEXTURE_QUERY_SAMPLES: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_LOAD_CONSTBUF: case PIPE_CAP_TEXTURE_MULTISAMPLE: case PIPE_CAP_SAMPLE_SHADING: diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index 76ce3f941e8..1d4c8f7fff2 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -210,7 +210,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: case PIPE_CAP_CULL_DISTANCE: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_MAX_WINDOW_RECTANGLES: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c index fe9858a61a4..7e570623ae3 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c @@ -325,7 +325,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_PCI_DEVICE: case PIPE_CAP_PCI_FUNCTION: case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: case PIPE_CAP_SHADER_CAN_READ_OUTPUTS: diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index 84f5667a526..dcaee7400b0 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -285,7 +285,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: case PIPE_CAP_CULL_DISTANCE: case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: case PIPE_CAP_SHADER_ARRAY_COMPONENTS: case PIPE_CAP_TGSI_MUL_ZERO_WINS: diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index b71e987258e..178097eb1f8 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -147,7 +147,7 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION: case PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET: case PIPE_CAP_TGSI_BALLOT: - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: case PIPE_CAP_FBFETCH: case PIPE_CAP_COMPUTE_GRID_INFO_LAST_BLOCK: case PIPE_CAP_IMAGE_LOAD_FORMATTED: diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index c6593da0a05..67214fe7af2 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -400,7 +400,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_DRAW_PARAMETERS: return screen->info.feats11.shaderDrawParameters || screen->info.have_KHR_shader_draw_parameters; - case PIPE_CAP_TGSI_VOTE: + case PIPE_CAP_SHADER_GROUP_VOTE: return screen->spirv_version >= SPIRV_VERSION(1, 3); case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 3aeb6eb5ea1..c9883ef342e 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -877,7 +877,7 @@ enum pipe_cap PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR, PIPE_CAP_CULL_DISTANCE, PIPE_CAP_CULL_DISTANCE_NOCOMBINE, - PIPE_CAP_TGSI_VOTE, + PIPE_CAP_SHADER_GROUP_VOTE, PIPE_CAP_MAX_WINDOW_RECTANGLES, PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED, PIPE_CAP_VIEWPORT_SUBPIXEL_BITS, diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index c5189184690..ddeec501623 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -813,7 +813,7 @@ void st_init_extensions(struct pipe_screen *screen, { o(ARB_shader_ballot), PIPE_CAP_TGSI_BALLOT }, { o(ARB_shader_clock), PIPE_CAP_TGSI_CLOCK }, { o(ARB_shader_draw_parameters), PIPE_CAP_DRAW_PARAMETERS }, - { o(ARB_shader_group_vote), PIPE_CAP_TGSI_VOTE }, + { o(ARB_shader_group_vote), PIPE_CAP_SHADER_GROUP_VOTE }, { o(EXT_shader_image_load_formatted), PIPE_CAP_IMAGE_LOAD_FORMATTED }, { o(EXT_shader_image_load_store), PIPE_CAP_TGSI_ATOMINC_WRAP }, { o(ARB_shader_stencil_export), PIPE_CAP_SHADER_STENCIL_EXPORT },
