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

radv: remove unused pCreateInfo from radv_pipeline_init_blend_state()

Browse Source 
I missed this one last time.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17542>
This commit is contained in:
Samuel Pitoiset
2022-07-14 14:26:53 +02:00
parent c45fded26b
commit a5f3a21261
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/vulkan/radv_pipeline.c
View File

@@ -520,7 +520,6 @@ format_is_float32(VkFormat format)
static void static void
radv_pipeline_compute_spi_color_formats(const struct radv_graphics_pipeline *pipeline, radv_pipeline_compute_spi_color_formats(const struct radv_graphics_pipeline *pipeline,
const VkGraphicsPipelineCreateInfo *pCreateInfo,
struct radv_blend_state *blend, struct radv_blend_state *blend,
const struct vk_graphics_pipeline_state *state) const struct vk_graphics_pipeline_state *state)
{ {
@@ -656,7 +655,6 @@ radv_blend_check_commutativity(struct radv_blend_state *blend, VkBlendOp op, VkB
static struct radv_blend_state static struct radv_blend_state
radv_pipeline_init_blend_state(struct radv_graphics_pipeline *pipeline, radv_pipeline_init_blend_state(struct radv_graphics_pipeline *pipeline,
const VkGraphicsPipelineCreateInfo *pCreateInfo,
const struct vk_graphics_pipeline_state *state) const struct vk_graphics_pipeline_state *state)
{ {
const struct radv_device *device = pipeline->base.device; const struct radv_device *device = pipeline->base.device;
@@ -826,7 +824,7 @@ radv_pipeline_init_blend_state(struct radv_graphics_pipeline *pipeline,
else else
cb_color_control |= S_028808_MODE(V_028808_CB_DISABLE); cb_color_control |= S_028808_MODE(V_028808_CB_DISABLE);
radv_pipeline_compute_spi_color_formats(pipeline, pCreateInfo, &blend, state); radv_pipeline_compute_spi_color_formats(pipeline, &blend, state);
pipeline->cb_color_control = cb_color_control; pipeline->cb_color_control = cb_color_control;
@@ -6519,7 +6517,7 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
struct radv_blend_state blend = radv_pipeline_init_blend_state(pipeline, pCreateInfo, &state); struct radv_blend_state blend = radv_pipeline_init_blend_state(pipeline, &state);
const VkPipelineCreationFeedbackCreateInfo *creation_feedback = const VkPipelineCreationFeedbackCreateInfo *creation_feedback =
vk_find_struct_const(pCreateInfo->pNext, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); vk_find_struct_const(pCreateInfo->pNext, PIPELINE_CREATION_FEEDBACK_CREATE_INFO);