OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvk: Use canonical variable names in nvk_shader.c

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-07-20 11:57:22 -05:00
committed by Marge Bot
parent 6170e1c8d9
commit 2be4acce25
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nouveau/vulkan/nvk_shader.c
View File

@@ -53,15 +53,15 @@ pipe_shader_type_from_mesa(gl_shader_stage stage)
} }
const nir_shader_compiler_options * const nir_shader_compiler_options *
nvk_physical_device_nir_options(const struct nvk_physical_device *pdevice, nvk_physical_device_nir_options(const struct nvk_physical_device *pdev,
gl_shader_stage stage) gl_shader_stage stage)
{ {
enum pipe_shader_type p_stage = pipe_shader_type_from_mesa(stage); enum pipe_shader_type p_stage = pipe_shader_type_from_mesa(stage);
return nv50_ir_nir_shader_compiler_options(pdevice->dev->chipset, p_stage); return nv50_ir_nir_shader_compiler_options(pdev->dev->chipset, p_stage);
} }
struct spirv_to_nir_options struct spirv_to_nir_options
nvk_physical_device_spirv_options(const struct nvk_physical_device *pdevice, nvk_physical_device_spirv_options(const struct nvk_physical_device *pdev,
const struct vk_pipeline_robustness_state *rs) const struct vk_pipeline_robustness_state *rs)
{ {
return (struct spirv_to_nir_options) { return (struct spirv_to_nir_options) {
@@ -364,12 +364,12 @@ nvk_optimize_nir(nir_shader *nir)
} }
void void
nvk_lower_nir(struct nvk_device *device, nir_shader *nir, nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
const struct vk_pipeline_robustness_state *rs, const struct vk_pipeline_robustness_state *rs,
bool is_multiview, bool is_multiview,
const struct vk_pipeline_layout *layout) const struct vk_pipeline_layout *layout)
{ {
struct nvk_physical_device *pdev = nvk_device_physical(device); struct nvk_physical_device *pdev = nvk_device_physical(dev);
NIR_PASS(_, nir, nir_split_struct_vars, nir_var_function_temp); NIR_PASS(_, nir, nir_split_struct_vars, nir_var_function_temp);
NIR_PASS(_, nir, nir_lower_vars_to_ssa); NIR_PASS(_, nir, nir_lower_vars_to_ssa);
@@ -1053,7 +1053,7 @@ nvk_fill_transform_feedback_state(struct nir_shader *nir,
} }
VkResult VkResult
nvk_compile_nir(struct nvk_physical_device *device, nir_shader *nir, nvk_compile_nir(struct nvk_physical_device *pdev, nir_shader *nir,
const struct nvk_fs_key *fs_key, const struct nvk_fs_key *fs_key,
struct nvk_shader *shader, struct nvk_shader *shader,
struct nvk_pipeline_compilation_ctx *ctx) struct nvk_pipeline_compilation_ctx *ctx)
@@ -1067,7 +1067,7 @@ nvk_compile_nir(struct nvk_physical_device *device, nir_shader *nir,
return false; return false;
info->type = pipe_shader_type_from_mesa(nir->info.stage); info->type = pipe_shader_type_from_mesa(nir->info.stage);
info->target = device->dev->chipset; info->target = pdev->dev->chipset;
info->bin.nir = nir; info->bin.nir = nir;
for (unsigned i = 0; i < 3; i++) for (unsigned i = 0; i < 3; i++)