pvr: add missing multi-arch support for pipeline exec and stats

Entry points must be wrapped in the PVR_PER_ARCH macro else there
will be multiple definitions of the same symbol.

Fixes: dfddb3fe ("pvr: Add support for VK_KHR_pipeline_executable_properties")
Signed-off-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
(cherry picked from commit 120bd20e49)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41268>
This commit is contained in:
Luigi Santivetti 2026-03-10 21:43:58 +00:00 committed by Eric Engestrom
parent 8dbc8528be
commit 54650350cc
2 changed files with 4 additions and 4 deletions

View file

@ -94,7 +94,7 @@
"description": "pvr: add missing multi-arch support for pipeline exec and stats",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "dfddb3fef1c29f69766f6575771f7fdad21464cd",
"notes": null

View file

@ -3476,7 +3476,7 @@ static uint32_t pvr_get_executable_count(struct pvr_pipeline *pipeline)
return exe_count;
}
VkResult pvr_GetPipelineExecutableStatisticsKHR(
VkResult PVR_PER_ARCH(GetPipelineExecutableStatisticsKHR)(
UNUSED VkDevice _device,
const VkPipelineExecutableInfoKHR *pExecutableInfo,
uint32_t *pStatisticCount,
@ -3518,7 +3518,7 @@ VkResult pvr_GetPipelineExecutableStatisticsKHR(
return vk_outarray_status(&out);
}
VkResult pvr_GetPipelineExecutablePropertiesKHR(
VkResult PVR_PER_ARCH(GetPipelineExecutablePropertiesKHR)(
VkDevice _device,
const VkPipelineInfoKHR *pPipelineInfo,
uint32_t *pExecutableCount,
@ -3607,7 +3607,7 @@ write_ir_text(VkPipelineExecutableInternalRepresentationKHR *ir,
return true;
}
VkResult pvr_GetPipelineExecutableInternalRepresentationsKHR(
VkResult PVR_PER_ARCH(GetPipelineExecutableInternalRepresentationsKHR)(
UNUSED VkDevice _device,
UNUSED const VkPipelineExecutableInfoKHR *pExecutableInfo,
uint32_t *pInternalRepresentationCount,