fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-25 11:20:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

nvk: drop unneeded shader type conversion function

Browse source 
This is both pointless now and not used anywhere.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26583>
This commit is contained in:
Dave Airlie 2023-12-08 11:04:33 +10:00
parent a7b054c974
commit 55e0aced28
2 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/nouveau/vulkan/nvk_codegen.c
View file

@ -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;

22
src/nouveau/vulkan/nvk_shader.c
View file

@ -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)
{