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

panvk: Don't pass the stage to shader_create()

Browse Source 
Can be extracted from stage_info instead.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28927>
This commit is contained in:
Boris Brezillon
2024-04-23 19:23:34 +02:00
committed by Marge Bot
parent 6724ee7619
commit e7a9bd1cbe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/panfrost/vulkan/panvk_shader.h
View File

@@ -65,8 +65,7 @@ bool panvk_per_arch(blend_needs_lowering)(const struct panvk_device *dev,
unsigned rt);
struct panvk_shader *panvk_per_arch(shader_create)(
struct panvk_device *dev, gl_shader_stage stage,
const VkPipelineShaderStageCreateInfo *stage_info,
struct panvk_device *dev, const VkPipelineShaderStageCreateInfo *stage_info,
const struct panvk_pipeline_layout *layout,
struct pan_blend_state *blend_state, bool static_blend_constants,
const VkAllocationCallbacks *alloc);

2
src/panfrost/vulkan/panvk_vX_pipeline.c
View File

@@ -103,7 +103,7 @@ compile_shaders(struct panvk_pipeline *pipeline,
struct panvk_shader *shader;
shader = panvk_per_arch(shader_create)(
dev, stage, stage_info, pipeline->layout,
dev, stage_info, pipeline->layout,
gfx_pipeline ? &gfx_pipeline->state.blend.pstate : NULL,
dyn_state_is_set(gfx_pipeline, MESA_VK_DYNAMIC_CB_BLEND_CONSTANTS),
alloc);

3
src/panfrost/vulkan/panvk_vX_shader.c
View File

@@ -212,7 +212,7 @@ shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align)
}
struct panvk_shader *
panvk_per_arch(shader_create)(struct panvk_device *dev, gl_shader_stage stage,
panvk_per_arch(shader_create)(struct panvk_device *dev,
const VkPipelineShaderStageCreateInfo *stage_info,
const struct panvk_pipeline_layout *layout,
struct pan_blend_state *blend_state,
@@ -224,6 +224,7 @@ panvk_per_arch(shader_create)(struct panvk_device *dev, gl_shader_stage stage,
to_panvk_physical_device(dev->vk.physical);
struct panvk_instance *instance =
to_panvk_instance(dev->vk.physical->instance);
gl_shader_stage stage = vk_to_mesa_shader_stage(stage_info->stage);
struct panvk_shader *shader;
shader = vk_zalloc2(&dev->vk.alloc, alloc, sizeof(*shader), 8,