Module: Mesa Branch: main Commit: 55e0aced289393a540f052c1870e1b0fea6e2fdc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=55e0aced289393a540f052c1870e1b0fea6e2fdc
Author: Dave Airlie <[email protected]> Date: Fri Dec 8 11:04:33 2023 +1000 nvk: drop unneeded shader type conversion function This is both pointless now and not used anywhere. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26583> --- src/nouveau/vulkan/nvk_codegen.c | 27 ++------------------------- src/nouveau/vulkan/nvk_shader.c | 22 ---------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/src/nouveau/vulkan/nvk_codegen.c b/src/nouveau/vulkan/nvk_codegen.c index 73d363e5ddd..725361f6a26 100644 --- a/src/nouveau/vulkan/nvk_codegen.c +++ b/src/nouveau/vulkan/nvk_codegen.c @@ -28,34 +28,11 @@ nvk_cg_get_prog_optimize(void) return debug_get_num_option("NV50_PROG_OPTIMIZE", 3); } -static inline enum pipe_shader_type -pipe_shader_type_from_mesa(gl_shader_stage stage) -{ - switch (stage) { - case MESA_SHADER_VERTEX: - return PIPE_SHADER_VERTEX; - case MESA_SHADER_TESS_CTRL: - return PIPE_SHADER_TESS_CTRL; - case MESA_SHADER_TESS_EVAL: - return PIPE_SHADER_TESS_EVAL; - case MESA_SHADER_GEOMETRY: - return PIPE_SHADER_GEOMETRY; - case MESA_SHADER_FRAGMENT: - return PIPE_SHADER_FRAGMENT; - case MESA_SHADER_COMPUTE: - case MESA_SHADER_KERNEL: - return PIPE_SHADER_COMPUTE; - default: - unreachable("bad shader stage"); - } -} - const nir_shader_compiler_options * nvk_cg_nir_options(const struct nvk_physical_device *pdev, gl_shader_stage stage) { - enum pipe_shader_type p_stage = pipe_shader_type_from_mesa(stage); - return nv50_ir_nir_shader_compiler_options(pdev->info.chipset, p_stage); + return nv50_ir_nir_shader_compiler_options(pdev->info.chipset, stage); } static nir_variable * @@ -830,7 +807,7 @@ nvk_cg_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir, if (!info) return false; - info->type = pipe_shader_type_from_mesa(nir->info.stage); + info->type = nir->info.stage; info->target = pdev->info.chipset; info->bin.nir = nir; diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index efe7744a52e..af18cbe2ec9 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -42,28 +42,6 @@ shared_var_info(const struct glsl_type *type, unsigned *size, unsigned *align) *size = comp_size * length, *align = comp_size; } -static inline enum pipe_shader_type -pipe_shader_type_from_mesa(gl_shader_stage stage) -{ - switch (stage) { - case MESA_SHADER_VERTEX: - return PIPE_SHADER_VERTEX; - case MESA_SHADER_TESS_CTRL: - return PIPE_SHADER_TESS_CTRL; - case MESA_SHADER_TESS_EVAL: - return PIPE_SHADER_TESS_EVAL; - case MESA_SHADER_GEOMETRY: - return PIPE_SHADER_GEOMETRY; - case MESA_SHADER_FRAGMENT: - return PIPE_SHADER_FRAGMENT; - case MESA_SHADER_COMPUTE: - case MESA_SHADER_KERNEL: - return PIPE_SHADER_COMPUTE; - default: - unreachable("bad shader stage"); - } -} - VkShaderStageFlags nvk_nak_stages(const struct nv_device_info *info) {
