Mesa (main): radv: remove unused parameters in radv_get_{wave,ballot_bit}_size()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 8 06:39:44 UTC 2022
Module: Mesa
Branch: main
Commit: e74217d5a7a5fcc35d04e175d4f37e869d57ffa6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e74217d5a7a5fcc35d04e175d4f37e869d57ffa6
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Thu Apr 7 10:38:43 2022 +0200
radv: remove unused parameters in radv_get_{wave,ballot_bit}_size()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15792>
---
src/amd/vulkan/radv_pipeline.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index cb87d5aa092..dba276fce90 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -3073,8 +3073,8 @@ radv_generate_graphics_pipeline_key(const struct radv_pipeline *pipeline,
}
static uint8_t
-radv_get_wave_size(struct radv_device *device, const VkPipelineShaderStageCreateInfo *pStage,
- gl_shader_stage stage, const struct radv_shader_info *info)
+radv_get_wave_size(struct radv_device *device, gl_shader_stage stage,
+ const struct radv_shader_info *info)
{
if (stage == MESA_SHADER_GEOMETRY && !info->is_ngg)
return 64;
@@ -3087,8 +3087,8 @@ radv_get_wave_size(struct radv_device *device, const VkPipelineShaderStageCreate
}
static uint8_t
-radv_get_ballot_bit_size(struct radv_device *device, const VkPipelineShaderStageCreateInfo *pStage,
- gl_shader_stage stage, const struct radv_shader_info *info)
+radv_get_ballot_bit_size(struct radv_device *device, gl_shader_stage stage,
+ const struct radv_shader_info *info)
{
if (stage == MESA_SHADER_COMPUTE && info->cs.subgroup_size)
return info->cs.subgroup_size;
@@ -3146,7 +3146,6 @@ radv_determine_ngg_settings(struct radv_pipeline *pipeline,
static void
radv_fill_shader_info(struct radv_pipeline *pipeline,
struct radv_pipeline_layout *pipeline_layout,
- const VkPipelineShaderStageCreateInfo **pStages,
const struct radv_pipeline_key *pipeline_key,
struct radv_shader_info *infos, nir_shader **nir)
{
@@ -3335,9 +3334,9 @@ radv_fill_shader_info(struct radv_pipeline *pipeline,
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; i++) {
if (nir[i]) {
- infos[i].wave_size = radv_get_wave_size(pipeline->device, pStages[i], i, &infos[i]);
+ infos[i].wave_size = radv_get_wave_size(pipeline->device, i, &infos[i]);
infos[i].ballot_bit_size =
- radv_get_ballot_bit_size(pipeline->device, pStages[i], i, &infos[i]);
+ radv_get_ballot_bit_size(pipeline->device, i, &infos[i]);
}
}
@@ -4237,7 +4236,7 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
NIR_PASS_V(nir[MESA_SHADER_FRAGMENT], radv_lower_fs_output, pipeline_key);
}
- radv_fill_shader_info(pipeline, pipeline_layout, pStages, pipeline_key, infos, nir);
+ radv_fill_shader_info(pipeline, pipeline_layout, pipeline_key, infos, nir);
bool pipeline_has_ngg = (nir[MESA_SHADER_VERTEX] && infos[MESA_SHADER_VERTEX].is_ngg) ||
(nir[MESA_SHADER_TESS_EVAL] && infos[MESA_SHADER_TESS_EVAL].is_ngg) ||
More information about the mesa-commit
mailing list