fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 03:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3dv: use VKAPI_ATTR and VKAPI_CALL.

Browse source 
Closes #4852

Signed-off-by: Georg Lehmann <dadschoorse@gmail.com>
Tested-by: Roman Stratiienko <r.stratiienko@gmail.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11062>
This commit is contained in:
Georg Lehmann 2021-05-28 14:53:25 +02:00 • committed by Marge Bot
parent 5a4384c2bc
commit 9d66a2d986
16 changed files with 214 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/broadcom/vulkan/v3dv_cmd_buffer.c
View file

@ -87,7 +87,7 @@ v3dv_job_add_bo_unchecked(struct v3dv_job *job, struct v3dv_bo *bo)
static void
cmd_buffer_emit_render_pass_rcl(struct v3dv_cmd_buffer *cmd_buffer);
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateCommandPool(VkDevice _device,
const VkCommandPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -915,7 +915,7 @@ cmd_buffer_reset(struct v3dv_cmd_buffer *cmd_buffer,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_AllocateCommandBuffers(VkDevice _device,
const VkCommandBufferAllocateInfo *pAllocateInfo,
VkCommandBuffer *pCommandBuffers)
@ -943,7 +943,7 @@ v3dv_AllocateCommandBuffers(VkDevice _device,
return result;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_FreeCommandBuffers(VkDevice device,
VkCommandPool commandPool,
uint32_t commandBufferCount,
@ -959,7 +959,7 @@ v3dv_FreeCommandBuffers(VkDevice device,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyCommandPool(VkDevice _device,
VkCommandPool commandPool,
const VkAllocationCallbacks *pAllocator)
@ -978,7 +978,7 @@ v3dv_DestroyCommandPool(VkDevice _device,
vk_object_free(&device->vk, pAllocator, pool);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_TrimCommandPool(VkDevice device,
VkCommandPool commandPool,
VkCommandPoolTrimFlags flags)
@ -1129,7 +1129,7 @@ cmd_buffer_begin_render_pass_secondary(
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_BeginCommandBuffer(VkCommandBuffer commandBuffer,
const VkCommandBufferBeginInfo *pBeginInfo)
{
@ -1162,7 +1162,7 @@ v3dv_BeginCommandBuffer(VkCommandBuffer commandBuffer,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_ResetCommandBuffer(VkCommandBuffer commandBuffer,
VkCommandBufferResetFlags flags)
{
@ -1170,7 +1170,7 @@ v3dv_ResetCommandBuffer(VkCommandBuffer commandBuffer,
return cmd_buffer_reset(cmd_buffer, flags);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_ResetCommandPool(VkDevice device,
VkCommandPool commandPool,
VkCommandPoolResetFlags flags)
@ -1383,7 +1383,7 @@ cmd_buffer_ensure_render_pass_attachment_state(struct v3dv_cmd_buffer *cmd_buffe
assert(state->attachment_alloc_count >= pass->attachment_count);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBeginRenderPass(VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo *pRenderPassBegin,
VkSubpassContents contents)
@ -1423,7 +1423,7 @@ v3dv_CmdBeginRenderPass(VkCommandBuffer commandBuffer,
v3dv_cmd_buffer_subpass_start(cmd_buffer, 0);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents)
{
V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer);
@ -2547,7 +2547,7 @@ v3dv_cmd_buffer_subpass_finish(struct v3dv_cmd_buffer *cmd_buffer)
job->is_subpass_finish = true;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdEndRenderPass(VkCommandBuffer commandBuffer)
{
V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer);
@ -2566,7 +2566,7 @@ v3dv_CmdEndRenderPass(VkCommandBuffer commandBuffer)
state->subpass_idx = -1;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EndCommandBuffer(VkCommandBuffer commandBuffer)
{
V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer);
@ -2905,7 +2905,7 @@ cmd_buffer_execute_outside_pass(struct v3dv_cmd_buffer *primary,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdExecuteCommands(VkCommandBuffer commandBuffer,
uint32_t commandBufferCount,
const VkCommandBuffer *pCommandBuffers)
@ -3161,7 +3161,7 @@ bind_compute_pipeline(struct v3dv_cmd_buffer *cmd_buffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_COMPUTE_PIPELINE;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBindPipeline(VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipeline _pipeline)
@ -3217,7 +3217,7 @@ v3dv_viewport_compute_xform(const VkViewport *viewport,
scale[2] = min_abs_scale * (scale[2] < 0 ? -1.0f : 1.0f);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetViewport(VkCommandBuffer commandBuffer,
uint32_t firstViewport,
uint32_t viewportCount,
@ -3250,7 +3250,7 @@ v3dv_CmdSetViewport(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_VIEWPORT;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetScissor(VkCommandBuffer commandBuffer,
uint32_t firstScissor,
uint32_t scissorCount,
@ -4460,7 +4460,7 @@ cmd_buffer_draw(struct v3dv_cmd_buffer *cmd_buffer,
cmd_buffer_emit_draw(cmd_buffer, info);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDraw(VkCommandBuffer commandBuffer,
uint32_t vertexCount,
uint32_t instanceCount,
@ -4480,7 +4480,7 @@ v3dv_CmdDraw(VkCommandBuffer commandBuffer,
cmd_buffer_draw(cmd_buffer, &info);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDrawIndexed(VkCommandBuffer commandBuffer,
uint32_t indexCount,
uint32_t instanceCount,
@ -4542,7 +4542,7 @@ v3dv_CmdDrawIndexed(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDrawIndirect(VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -4577,7 +4577,7 @@ v3dv_CmdDrawIndirect(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -4615,7 +4615,7 @@ v3dv_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdPipelineBarrier(VkCommandBuffer commandBuffer,
VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags dstStageMask,
@ -4651,7 +4651,7 @@ v3dv_CmdPipelineBarrier(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBindVertexBuffers(VkCommandBuffer commandBuffer,
uint32_t firstBinding,
uint32_t bindingCount,
@ -4697,7 +4697,7 @@ get_index_size(VkIndexType index_type)
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBindIndexBuffer(VkCommandBuffer commandBuffer,
VkBuffer buffer,
VkDeviceSize offset,
@ -4718,7 +4718,7 @@ v3dv_CmdBindIndexBuffer(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_INDEX_BUFFER;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t compareMask)
@ -4733,7 +4733,7 @@ v3dv_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_STENCIL_COMPARE_MASK;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t writeMask)
@ -4748,7 +4748,7 @@ v3dv_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_STENCIL_WRITE_MASK;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetStencilReference(VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t reference)
@ -4763,7 +4763,7 @@ v3dv_CmdSetStencilReference(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_STENCIL_REFERENCE;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetDepthBias(VkCommandBuffer commandBuffer,
float depthBiasConstantFactor,
float depthBiasClamp,
@ -4777,7 +4777,7 @@ v3dv_CmdSetDepthBias(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_DEPTH_BIAS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetDepthBounds(VkCommandBuffer commandBuffer,
float minDepthBounds,
float maxDepthBounds)
@ -4787,7 +4787,7 @@ v3dv_CmdSetDepthBounds(VkCommandBuffer commandBuffer,
*/
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetLineWidth(VkCommandBuffer commandBuffer,
float lineWidth)
{
@ -4797,7 +4797,7 @@ v3dv_CmdSetLineWidth(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty |= V3DV_CMD_DIRTY_LINE_WIDTH;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipelineLayout _layout,
@ -4854,7 +4854,7 @@ v3dv_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdPushConstants(VkCommandBuffer commandBuffer,
VkPipelineLayout layout,
VkShaderStageFlags stageFlags,
@ -4873,7 +4873,7 @@ v3dv_CmdPushConstants(VkCommandBuffer commandBuffer,
cmd_buffer->state.dirty_push_constants_stages |= stageFlags;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetBlendConstants(VkCommandBuffer commandBuffer,
const float blendConstants[4])
{
@ -5058,7 +5058,7 @@ v3dv_cmd_buffer_add_tfu_job(struct v3dv_cmd_buffer *cmd_buffer,
list_addtail(&job->list_link, &cmd_buffer->jobs);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetEvent(VkCommandBuffer commandBuffer,
VkEvent _event,
VkPipelineStageFlags stageMask)
@ -5084,7 +5084,7 @@ v3dv_CmdSetEvent(VkCommandBuffer commandBuffer,
list_addtail(&job->list_link, &cmd_buffer->jobs);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdResetEvent(VkCommandBuffer commandBuffer,
VkEvent _event,
VkPipelineStageFlags stageMask)
@ -5110,7 +5110,7 @@ v3dv_CmdResetEvent(VkCommandBuffer commandBuffer,
list_addtail(&job->list_link, &cmd_buffer->jobs);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdWaitEvents(VkCommandBuffer commandBuffer,
uint32_t eventCount,
const VkEvent *pEvents,
@ -5163,7 +5163,7 @@ v3dv_CmdWaitEvents(VkCommandBuffer commandBuffer,
list_addtail(&job->list_link, &cmd_buffer->jobs);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdWriteTimestamp(VkCommandBuffer commandBuffer,
VkPipelineStageFlagBits pipelineStage,
VkQueryPool queryPool,
@ -5398,7 +5398,7 @@ cmd_buffer_dispatch(struct v3dv_cmd_buffer *cmd_buffer,
cmd_buffer->state.job = NULL;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDispatch(VkCommandBuffer commandBuffer,
uint32_t groupCountX,
uint32_t groupCountY,
@ -5411,13 +5411,14 @@ v3dv_CmdDispatch(VkCommandBuffer commandBuffer,
groupCountX, groupCountY, groupCountZ);
}
void v3dv_CmdDispatchBase(VkCommandBuffer commandBuffer,
uint32_t baseGroupX,
uint32_t baseGroupY,
uint32_t baseGroupZ,
uint32_t groupCountX,
uint32_t groupCountY,
uint32_t groupCountZ)
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDispatchBase(VkCommandBuffer commandBuffer,
uint32_t baseGroupX,
uint32_t baseGroupY,
uint32_t baseGroupZ,
uint32_t groupCountX,
uint32_t groupCountY,
uint32_t groupCountZ)
{
V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer);
@ -5475,7 +5476,7 @@ cmd_buffer_dispatch_indirect(struct v3dv_cmd_buffer *cmd_buffer,
cmd_buffer->state.job = NULL;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdDispatchIndirect(VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset)
@ -5489,7 +5490,7 @@ v3dv_CmdDispatchIndirect(VkCommandBuffer commandBuffer,
cmd_buffer_dispatch_indirect(cmd_buffer, buffer, offset);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask)
{
/* Nothing to do here since we only support a single device */

22
src/broadcom/vulkan/v3dv_descriptor_set.c
View file

@ -338,7 +338,7 @@ v3dv_descriptor_map_get_texture_shader_state(struct v3dv_descriptor_state *descr
* just multiple descriptor set layouts pasted together."
*/
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreatePipelineLayout(VkDevice _device,
const VkPipelineLayoutCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -388,7 +388,7 @@ v3dv_CreatePipelineLayout(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyPipelineLayout(VkDevice _device,
VkPipelineLayout _pipelineLayout,
const VkAllocationCallbacks *pAllocator)
@ -401,7 +401,7 @@ v3dv_DestroyPipelineLayout(VkDevice _device,
vk_object_free(&device->vk, pAllocator, pipeline_layout);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateDescriptorPool(VkDevice _device,
const VkDescriptorPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -514,7 +514,7 @@ descriptor_set_destroy(struct v3dv_device *device,
vk_object_free(&device->vk, NULL, set);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyDescriptorPool(VkDevice _device,
VkDescriptorPool _pool,
const VkAllocationCallbacks *pAllocator)
@ -539,7 +539,7 @@ v3dv_DestroyDescriptorPool(VkDevice _device,
vk_object_free(&device->vk, pAllocator, pool);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_ResetDescriptorPool(VkDevice _device,
VkDescriptorPool descriptorPool,
VkDescriptorPoolResetFlags flags)
@ -566,7 +566,7 @@ v3dv_ResetDescriptorPool(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateDescriptorSetLayout(VkDevice _device,
const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -702,7 +702,7 @@ v3dv_CreateDescriptorSetLayout(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyDescriptorSetLayout(VkDevice _device,
VkDescriptorSetLayout _set_layout,
const VkAllocationCallbacks *pAllocator)
@ -843,7 +843,7 @@ descriptor_set_create(struct v3dv_device *device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_AllocateDescriptorSets(VkDevice _device,
const VkDescriptorSetAllocateInfo *pAllocateInfo,
VkDescriptorSet *pDescriptorSets)
@ -877,7 +877,7 @@ v3dv_AllocateDescriptorSets(VkDevice _device,
return result;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_FreeDescriptorSets(VkDevice _device,
VkDescriptorPool descriptorPool,
uint32_t count,
@ -959,7 +959,7 @@ write_buffer_view_descriptor(VkDescriptorType desc_type,
sizeof(bview->texture_shader_state));
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_UpdateDescriptorSets(VkDevice _device,
uint32_t descriptorWriteCount,
const VkWriteDescriptorSet *pDescriptorWrites,
@ -1105,7 +1105,7 @@ v3dv_UpdateDescriptorSets(VkDevice _device,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetDescriptorSetLayoutSupport(
VkDevice device,
const VkDescriptorSetLayoutCreateInfo *pCreateInfo,

102
src/broadcom/vulkan/v3dv_device.c
View file

@ -61,21 +61,21 @@
#include "drm-uapi/i915_drm.h"
#endif
static void *
static VKAPI_ATTR void * VKAPI_CALL
default_alloc_func(void *pUserData, size_t size, size_t align,
VkSystemAllocationScope allocationScope)
{
return malloc(size);
}
static void *
static VKAPI_ATTR void * VKAPI_CALL
default_realloc_func(void *pUserData, void *pOriginal, size_t size,
size_t align, VkSystemAllocationScope allocationScope)
{
return realloc(pOriginal, size);
}
static void
static VKAPI_ATTR void VKAPI_CALL
default_free_func(void *pUserData, void *pMemory)
{
free(pMemory);
@ -90,7 +90,7 @@ static const VkAllocationCallbacks default_alloc = {
#define V3DV_API_VERSION VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION)
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumerateInstanceVersion(uint32_t *pApiVersion)
{
*pApiVersion = V3DV_API_VERSION;
@ -148,7 +148,7 @@ get_device_extensions(const struct v3dv_physical_device *device,
};
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumerateInstanceExtensionProperties(const char *pLayerName,
uint32_t *pPropertyCount,
VkExtensionProperties *pProperties)
@ -161,7 +161,7 @@ v3dv_EnumerateInstanceExtensionProperties(const char *pLayerName,
&instance_extensions, pPropertyCount, pProperties);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
VkInstance *pInstance)
@ -268,7 +268,7 @@ physical_device_finish(struct v3dv_physical_device *device)
mtx_destroy(&device->mutex);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyInstance(VkInstance _instance,
const VkAllocationCallbacks *pAllocator)
{
@ -894,7 +894,7 @@ instance_ensure_physical_device(struct v3dv_instance *instance)
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumeratePhysicalDevices(VkInstance _instance,
uint32_t *pPhysicalDeviceCount,
VkPhysicalDevice *pPhysicalDevices)
@ -917,7 +917,7 @@ v3dv_EnumeratePhysicalDevices(VkInstance _instance,
return vk_outarray_status(&out);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumeratePhysicalDeviceGroups(
VkInstance _instance,
uint32_t *pPhysicalDeviceGroupCount,
@ -947,7 +947,7 @@ v3dv_EnumeratePhysicalDeviceGroups(
return vk_outarray_status(&out);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures *pFeatures)
{
@ -1016,7 +1016,7 @@ v3dv_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice,
};
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2 *pFeatures)
{
@ -1038,7 +1038,7 @@ v3dv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetDeviceGroupPeerMemoryFeatures(VkDevice device,
uint32_t heapIndex,
uint32_t localDeviceIndex,
@ -1094,7 +1094,7 @@ v3dv_physical_device_device_id(struct v3dv_physical_device *dev)
#endif
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties *pProperties)
{
@ -1269,7 +1269,7 @@ v3dv_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
pdevice->pipeline_cache_uuid, VK_UUID_SIZE);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2 *pProperties)
{
@ -1341,7 +1341,7 @@ v3dv_queue_family_properties = {
.minImageTransferGranularity = { 1, 1, 1 },
};
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice,
uint32_t *pCount,
VkQueueFamilyProperties *pQueueFamilyProperties)
@ -1353,7 +1353,7 @@ v3dv_GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice,
uint32_t *pQueueFamilyPropertyCount,
VkQueueFamilyProperties2 *pQueueFamilyProperties)
@ -1369,7 +1369,7 @@ v3dv_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties *pMemoryProperties)
{
@ -1377,7 +1377,7 @@ v3dv_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice,
*pMemoryProperties = device->memory;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2 *pMemoryProperties)
{
@ -1393,7 +1393,7 @@ v3dv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice,
}
}
PFN_vkVoidFunction
VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
v3dv_GetInstanceProcAddr(VkInstance _instance,
const char *pName)
{
@ -1436,7 +1436,7 @@ vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance,
return vk_instance_get_physical_device_proc_addr(&instance->vk, pName);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount,
VkLayerProperties *pProperties)
{
@ -1448,7 +1448,7 @@ v3dv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount,
return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice,
uint32_t *pPropertyCount,
VkLayerProperties *pProperties)
@ -1504,7 +1504,7 @@ destroy_device_meta(struct v3dv_device *device)
v3dv_meta_texel_buffer_copy_finish(device);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateDevice(VkPhysicalDevice physicalDevice,
const VkDeviceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -1605,7 +1605,7 @@ fail:
return result;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyDevice(VkDevice _device,
const VkAllocationCallbacks *pAllocator)
{
@ -1632,7 +1632,7 @@ v3dv_DestroyDevice(VkDevice _device,
vk_free2(&default_alloc, pAllocator, device);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetDeviceQueue(VkDevice _device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
@ -1646,7 +1646,7 @@ v3dv_GetDeviceQueue(VkDevice _device,
*pQueue = v3dv_queue_to_handle(&device->queue);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_DeviceWaitIdle(VkDevice _device)
{
V3DV_FROM_HANDLE(v3dv_device, device, _device);
@ -1858,7 +1858,7 @@ fail_create:
#endif
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_AllocateMemory(VkDevice _device,
const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator,
@ -1949,7 +1949,7 @@ v3dv_AllocateMemory(VkDevice _device,
return result;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_FreeMemory(VkDevice _device,
VkDeviceMemory _mem,
const VkAllocationCallbacks *pAllocator)
@ -1968,7 +1968,7 @@ v3dv_FreeMemory(VkDevice _device,
vk_object_free(&device->vk, pAllocator, mem);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_MapMemory(VkDevice _device,
VkDeviceMemory _memory,
VkDeviceSize offset,
@ -1999,7 +1999,7 @@ v3dv_MapMemory(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_UnmapMemory(VkDevice _device,
VkDeviceMemory _memory)
{
@ -2012,7 +2012,7 @@ v3dv_UnmapMemory(VkDevice _device,
device_unmap(device, mem);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_FlushMappedMemoryRanges(VkDevice _device,
uint32_t memoryRangeCount,
const VkMappedMemoryRange *pMemoryRanges)
@ -2020,7 +2020,7 @@ v3dv_FlushMappedMemoryRanges(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_InvalidateMappedMemoryRanges(VkDevice _device,
uint32_t memoryRangeCount,
const VkMappedMemoryRange *pMemoryRanges)
@ -2028,7 +2028,7 @@ v3dv_InvalidateMappedMemoryRanges(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetImageMemoryRequirements2(VkDevice device,
const VkImageMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@ -2076,7 +2076,7 @@ bind_image_memory(const VkBindImageMemoryInfo *info)
image->mem_offset = info->memoryOffset;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_BindImageMemory2(VkDevice _device,
uint32_t bindInfoCount,
const VkBindImageMemoryInfo *pBindInfos)
@ -2104,7 +2104,7 @@ v3dv_BindImageMemory2(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetBufferMemoryRequirements2(VkDevice device,
const VkBufferMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@ -2153,7 +2153,7 @@ bind_buffer_memory(const VkBindBufferMemoryInfo *info)
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_BindBufferMemory2(VkDevice device,
uint32_t bindInfoCount,
const VkBindBufferMemoryInfo *pBindInfos)
@ -2164,7 +2164,7 @@ v3dv_BindBufferMemory2(VkDevice device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateBuffer(VkDevice _device,
const VkBufferCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -2198,7 +2198,7 @@ v3dv_CreateBuffer(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyBuffer(VkDevice _device,
VkBuffer _buffer,
const VkAllocationCallbacks *pAllocator)
@ -2272,7 +2272,7 @@ v3dv_framebuffer_compute_internal_bpp_msaa(
return;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateFramebuffer(VkDevice _device,
const VkFramebufferCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -2309,7 +2309,7 @@ v3dv_CreateFramebuffer(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyFramebuffer(VkDevice _device,
VkFramebuffer _fb,
const VkAllocationCallbacks *pAllocator)
@ -2323,7 +2323,7 @@ v3dv_DestroyFramebuffer(VkDevice _device,
vk_object_free(&device->vk, pAllocator, fb);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetMemoryFdPropertiesKHR(VkDevice _device,
VkExternalMemoryHandleTypeFlagBits handleType,
int fd,
@ -2342,7 +2342,7 @@ v3dv_GetMemoryFdPropertiesKHR(VkDevice _device,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetMemoryFdKHR(VkDevice _device,
const VkMemoryGetFdInfoKHR *pGetFdInfo,
int *pFd)
@ -2366,7 +2366,7 @@ v3dv_GetMemoryFdKHR(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateEvent(VkDevice _device,
const VkEventCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -2386,7 +2386,7 @@ v3dv_CreateEvent(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyEvent(VkDevice _device,
VkEvent _event,
const VkAllocationCallbacks *pAllocator)
@ -2400,14 +2400,14 @@ v3dv_DestroyEvent(VkDevice _device,
vk_object_free(&device->vk, pAllocator, event);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetEventStatus(VkDevice _device, VkEvent _event)
{
V3DV_FROM_HANDLE(v3dv_event, event, _event);
return p_atomic_read(&event->state) ? VK_EVENT_SET : VK_EVENT_RESET;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_SetEvent(VkDevice _device, VkEvent _event)
{
V3DV_FROM_HANDLE(v3dv_event, event, _event);
@ -2415,7 +2415,7 @@ v3dv_SetEvent(VkDevice _device, VkEvent _event)
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_ResetEvent(VkDevice _device, VkEvent _event)
{
V3DV_FROM_HANDLE(v3dv_event, event, _event);
@ -2517,7 +2517,7 @@ pack_sampler_state(struct v3dv_sampler *sampler,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateSampler(VkDevice _device,
const VkSamplerCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -2542,7 +2542,7 @@ v3dv_CreateSampler(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroySampler(VkDevice _device,
VkSampler _sampler,
const VkAllocationCallbacks *pAllocator)
@ -2556,7 +2556,7 @@ v3dv_DestroySampler(VkDevice _device,
vk_object_free(&device->vk, pAllocator, sampler);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetDeviceMemoryCommitment(VkDevice device,
VkDeviceMemory memory,
VkDeviceSize *pCommittedMemoryInBytes)
@ -2564,7 +2564,7 @@ v3dv_GetDeviceMemoryCommitment(VkDevice device,
*pCommittedMemoryInBytes = 0;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetImageSparseMemoryRequirements(
VkDevice device,
VkImage image,
@ -2574,7 +2574,7 @@ v3dv_GetImageSparseMemoryRequirements(
*pSparseMemoryRequirementCount = 0;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetImageSparseMemoryRequirements2(
VkDevice device,
const VkImageSparseMemoryRequirementsInfo2 *pInfo,

14
src/broadcom/vulkan/v3dv_formats.c
View file

@ -565,7 +565,7 @@ v3dv_buffer_format_supports_features(VkFormat vk_format,
return (supported & features) == features;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties* pFormatProperties)
@ -582,7 +582,7 @@ v3dv_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
};
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties2 *pFormatProperties)
@ -775,7 +775,7 @@ static const VkExternalMemoryProperties prime_fd_props = {
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
};
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
@ -801,7 +801,7 @@ v3dv_GetPhysicalDeviceImageFormatProperties(
pImageFormatProperties, NULL);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2 *base_info,
VkImageFormatProperties2 *base_props)
@ -875,7 +875,7 @@ done:
return result;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceSparseImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
@ -889,7 +889,7 @@ v3dv_GetPhysicalDeviceSparseImageFormatProperties(
*pPropertyCount = 0;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo,
@ -899,7 +899,7 @@ v3dv_GetPhysicalDeviceSparseImageFormatProperties2(
*pPropertyCount = 0;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo,

16
src/broadcom/vulkan/v3dv_image.c
View file

@ -392,7 +392,7 @@ create_image_from_swapchain(struct v3dv_device *device,
return create_image(device, &local_create_info, pAllocator, pImage);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateImage(VkDevice _device,
const VkImageCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -409,7 +409,7 @@ v3dv_CreateImage(VkDevice _device,
return create_image(device, pCreateInfo, pAllocator, pImage);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetImageSubresourceLayout(VkDevice device,
VkImage _image,
const VkImageSubresource *subresource,
@ -444,7 +444,7 @@ v3dv_GetImageSubresourceLayout(VkDevice device,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetImageDrmFormatModifierPropertiesEXT(
VkDevice device,
VkImage _image,
@ -460,7 +460,7 @@ v3dv_GetImageDrmFormatModifierPropertiesEXT(
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyImage(VkDevice _device,
VkImage _image,
const VkAllocationCallbacks* pAllocator)
@ -681,7 +681,7 @@ vk_component_mapping_to_pipe_swizzle(VkComponentSwizzle comp,
};
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateImageView(VkDevice _device,
const VkImageViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -810,7 +810,7 @@ v3dv_CreateImageView(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyImageView(VkDevice _device,
VkImageView imageView,
const VkAllocationCallbacks* pAllocator)
@ -866,7 +866,7 @@ pack_texture_shader_state_from_buffer_view(struct v3dv_device *device,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateBufferView(VkDevice _device,
const VkBufferViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -912,7 +912,7 @@ v3dv_CreateBufferView(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyBufferView(VkDevice _device,
VkBufferView bufferView,
const VkAllocationCallbacks *pAllocator)

2
src/broadcom/vulkan/v3dv_meta_clear.c
View file

@ -1622,7 +1622,7 @@ all_clear_rects_in_base_layer(uint32_t rect_count, const VkClearRect *rects)
return true;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdClearAttachments(VkCommandBuffer commandBuffer,
uint32_t attachmentCount,
const VkClearAttachment *pAttachments,

20
src/broadcom/vulkan/v3dv_meta_copy.c
View file

@ -1319,7 +1319,7 @@ can_use_tlb(struct v3dv_image *image,
return false;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -1915,7 +1915,7 @@ copy_image_blit(struct v3dv_cmd_buffer *cmd_buffer,
return handled;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdCopyImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -2128,7 +2128,7 @@ clear_image_tlb(struct v3dv_cmd_buffer *cmd_buffer,
return true;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdClearColorImage(VkCommandBuffer commandBuffer,
VkImage _image,
VkImageLayout imageLayout,
@ -2150,7 +2150,7 @@ v3dv_CmdClearColorImage(VkCommandBuffer commandBuffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer,
VkImage _image,
VkImageLayout imageLayout,
@ -2359,7 +2359,7 @@ copy_buffer(struct v3dv_cmd_buffer *cmd_buffer,
return job;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdCopyBuffer(VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkBuffer dstBuffer,
@ -2388,7 +2388,7 @@ destroy_update_buffer_cb(VkDevice _device,
v3dv_bo_free(device, bo);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdUpdateBuffer(VkCommandBuffer commandBuffer,
VkBuffer dstBuffer,
VkDeviceSize dstOffset,
@ -2543,7 +2543,7 @@ fill_buffer(struct v3dv_cmd_buffer *cmd_buffer,
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdFillBuffer(VkCommandBuffer commandBuffer,
VkBuffer dstBuffer,
VkDeviceSize dstOffset,
@ -4031,7 +4031,7 @@ copy_buffer_to_image_cpu(struct v3dv_cmd_buffer *cmd_buffer,
return true;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdCopyBufferToImage(VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkImage dstImage,
@ -5509,7 +5509,7 @@ fail:
return handled;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBlitImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -5717,7 +5717,7 @@ resolve_image_blit(struct v3dv_cmd_buffer *cmd_buffer,
&blit_region, VK_FILTER_NEAREST, true);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdResolveImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,

6
src/broadcom/vulkan/v3dv_pass.c
View file

@ -100,7 +100,7 @@ pass_find_subpass_range_for_attachments(struct v3dv_render_pass *pass)
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateRenderPass(VkDevice _device,
const VkRenderPassCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -239,7 +239,7 @@ v3dv_CreateRenderPass(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyRenderPass(VkDevice _device,
VkRenderPass _pass,
const VkAllocationCallbacks *pAllocator)
@ -306,7 +306,7 @@ subpass_get_granularity(struct v3dv_render_pass *pass,
};
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_GetRenderAreaGranularity(VkDevice device,
VkRenderPass renderPass,
VkExtent2D *pGranularity)

6
src/broadcom/vulkan/v3dv_pipeline.c
View file

@ -157,7 +157,7 @@ v3dv_destroy_pipeline(struct v3dv_pipeline *pipeline,
vk_object_free(&device->vk, pAllocator, pipeline);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyPipeline(VkDevice _device,
VkPipeline _pipeline,
const VkAllocationCallbacks *pAllocator)
@ -3146,7 +3146,7 @@ graphics_pipeline_create(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateGraphicsPipelines(VkDevice _device,
VkPipelineCache pipelineCache,
uint32_t count,
@ -3344,7 +3344,7 @@ compute_pipeline_create(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateComputePipelines(VkDevice _device,
VkPipelineCache pipelineCache,
uint32_t createInfoCount,

8
src/broadcom/vulkan/v3dv_pipeline_cache.c
View file

@ -656,7 +656,7 @@ pipeline_cache_load(struct v3dv_pipeline_cache *cache,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreatePipelineCache(VkDevice _device,
const VkPipelineCacheCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -715,7 +715,7 @@ v3dv_pipeline_cache_finish(struct v3dv_pipeline_cache *cache)
}
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyPipelineCache(VkDevice _device,
VkPipelineCache _cache,
const VkAllocationCallbacks *pAllocator)
@ -731,7 +731,7 @@ v3dv_DestroyPipelineCache(VkDevice _device,
vk_object_free(&device->vk, pAllocator, cache);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_MergePipelineCaches(VkDevice device,
VkPipelineCache dstCache,
uint32_t srcCacheCount,
@ -896,7 +896,7 @@ v3dv_pipeline_shared_data_write_to_blob(const struct v3dv_pipeline_shared_data *
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPipelineCacheData(VkDevice _device,
VkPipelineCache _cache,
size_t *pDataSize,

14
src/broadcom/vulkan/v3dv_query.c
View file

@ -23,7 +23,7 @@
#include "v3dv_private.h"
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateQueryPool(VkDevice _device,
const VkQueryPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -105,7 +105,7 @@ fail:
return result;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyQueryPool(VkDevice _device,
VkQueryPool queryPool,
const VkAllocationCallbacks *pAllocator)
@ -270,7 +270,7 @@ v3dv_get_query_pool_results_cpu(struct v3dv_device *device,
return result;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetQueryPoolResults(VkDevice _device,
VkQueryPool queryPool,
uint32_t firstQuery,
@ -287,7 +287,7 @@ v3dv_GetQueryPoolResults(VkDevice _device,
pData, stride, flags);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdResetQueryPool(VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
@ -299,7 +299,7 @@ v3dv_CmdResetQueryPool(VkCommandBuffer commandBuffer,
v3dv_cmd_buffer_reset_queries(cmd_buffer, pool, firstQuery, queryCount);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
@ -318,7 +318,7 @@ v3dv_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer,
dst, dstOffset, stride, flags);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdBeginQuery(VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query,
@ -330,7 +330,7 @@ v3dv_CmdBeginQuery(VkCommandBuffer commandBuffer,
v3dv_cmd_buffer_begin_query(cmd_buffer, pool, query, flags);
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_CmdEndQuery(VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query)

20
src/broadcom/vulkan/v3dv_queue.c
View file

@ -142,7 +142,7 @@ gpu_queue_wait_idle(struct v3dv_queue *queue)
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_QueueWaitIdle(VkQueue _queue)
{
V3DV_FROM_HANDLE(v3dv_queue, queue, _queue);
@ -1080,7 +1080,7 @@ done:
return result;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_QueueSubmit(VkQueue _queue,
uint32_t submitCount,
const VkSubmitInfo* pSubmits,
@ -1115,7 +1115,7 @@ done:
return result;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateSemaphore(VkDevice _device,
const VkSemaphoreCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -1144,7 +1144,7 @@ v3dv_CreateSemaphore(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroySemaphore(VkDevice _device,
VkSemaphore semaphore,
const VkAllocationCallbacks *pAllocator)
@ -1163,7 +1163,7 @@ v3dv_DestroySemaphore(VkDevice _device,
vk_object_free(&device->vk, pAllocator, sem);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateFence(VkDevice _device,
const VkFenceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -1195,7 +1195,7 @@ v3dv_CreateFence(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroyFence(VkDevice _device,
VkFence _fence,
const VkAllocationCallbacks *pAllocator)
@ -1214,7 +1214,7 @@ v3dv_DestroyFence(VkDevice _device,
vk_object_free(&device->vk, pAllocator, fence);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetFenceStatus(VkDevice _device, VkFence _fence)
{
V3DV_FROM_HANDLE(v3dv_device, device, _device);
@ -1229,7 +1229,7 @@ v3dv_GetFenceStatus(VkDevice _device, VkFence _fence)
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences)
{
V3DV_FROM_HANDLE(v3dv_device, device, _device);
@ -1254,7 +1254,7 @@ v3dv_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences)
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_WaitForFences(VkDevice _device,
uint32_t fenceCount,
const VkFence *pFences,
@ -1295,7 +1295,7 @@ v3dv_WaitForFences(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_QueueBindSparse(VkQueue _queue,
uint32_t bindInfoCount,
const VkBindSparseInfo *pBindInfo,

50
src/broadcom/vulkan/v3dv_wsi.c
View file

@ -29,7 +29,7 @@
#include "vk_util.h"
#include "wsi_common.h"
static PFN_vkVoidFunction
static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
v3dv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{
V3DV_FROM_HANDLE(v3dv_physical_device, pdevice, physicalDevice);
@ -99,7 +99,8 @@ v3dv_wsi_finish(struct v3dv_physical_device *physical_device)
&physical_device->vk.instance->alloc);
}
void v3dv_DestroySurfaceKHR(
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroySurfaceKHR(
VkInstance _instance,
VkSurfaceKHR _surface,
const VkAllocationCallbacks* pAllocator)
@ -113,7 +114,8 @@ void v3dv_DestroySurfaceKHR(
vk_free2(&instance->vk.alloc, pAllocator, surface);
}
VkResult v3dv_GetPhysicalDeviceSurfaceSupportKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
VkSurfaceKHR surface,
@ -141,7 +143,8 @@ constraint_surface_capabilities(VkSurfaceCapabilitiesKHR *caps)
caps->supportedUsageFlags &= ~VK_IMAGE_USAGE_SAMPLED_BIT;
}
VkResult v3dv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities)
@ -156,7 +159,8 @@ VkResult v3dv_GetPhysicalDeviceSurfaceCapabilitiesKHR(
return result;
}
VkResult v3dv_GetPhysicalDeviceSurfaceCapabilities2KHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfaceCapabilities2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
@ -171,7 +175,8 @@ VkResult v3dv_GetPhysicalDeviceSurfaceCapabilities2KHR(
return result;
}
VkResult v3dv_GetPhysicalDeviceSurfaceFormatsKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfaceFormatsKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pSurfaceFormatCount,
@ -183,7 +188,8 @@ VkResult v3dv_GetPhysicalDeviceSurfaceFormatsKHR(
pSurfaceFormatCount, pSurfaceFormats);
}
VkResult v3dv_GetPhysicalDeviceSurfaceFormats2KHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfaceFormats2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
uint32_t* pSurfaceFormatCount,
@ -195,7 +201,8 @@ VkResult v3dv_GetPhysicalDeviceSurfaceFormats2KHR(
pSurfaceFormatCount, pSurfaceFormats);
}
VkResult v3dv_GetPhysicalDeviceSurfacePresentModesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceSurfacePresentModesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pPresentModeCount,
@ -208,7 +215,8 @@ VkResult v3dv_GetPhysicalDeviceSurfacePresentModesKHR(
pPresentModes);
}
VkResult v3dv_CreateSwapchainKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateSwapchainKHR(
VkDevice _device,
const VkSwapchainCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -235,7 +243,8 @@ VkResult v3dv_CreateSwapchainKHR(
pCreateInfo, alloc, pSwapchain);
}
void v3dv_DestroySwapchainKHR(
VKAPI_ATTR void VKAPI_CALL
v3dv_DestroySwapchainKHR(
VkDevice _device,
VkSwapchainKHR swapchain,
const VkAllocationCallbacks* pAllocator)
@ -251,7 +260,8 @@ void v3dv_DestroySwapchainKHR(
wsi_common_destroy_swapchain(_device, swapchain, alloc);
}
VkResult v3dv_GetSwapchainImagesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetSwapchainImagesKHR(
VkDevice device,
VkSwapchainKHR swapchain,
uint32_t* pSwapchainImageCount,
@ -280,7 +290,8 @@ v3dv_wsi_get_image_from_swapchain(VkSwapchainKHR swapchain, uint32_t index)
return image;
}
VkResult v3dv_AcquireNextImageKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_AcquireNextImageKHR(
VkDevice device,
VkSwapchainKHR swapchain,
uint64_t timeout,
@ -300,7 +311,8 @@ VkResult v3dv_AcquireNextImageKHR(
return v3dv_AcquireNextImage2KHR(device, &acquire_info, pImageIndex);
}
VkResult v3dv_AcquireNextImage2KHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_AcquireNextImage2KHR(
VkDevice _device,
const VkAcquireNextImageInfoKHR* pAcquireInfo,
uint32_t* pImageIndex)
@ -325,7 +337,8 @@ VkResult v3dv_AcquireNextImage2KHR(
return result;
}
VkResult v3dv_QueuePresentKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_QueuePresentKHR(
VkQueue _queue,
const VkPresentInfoKHR* pPresentInfo)
{
@ -339,7 +352,8 @@ VkResult v3dv_QueuePresentKHR(
pPresentInfo);
}
VkResult v3dv_GetDeviceGroupPresentCapabilitiesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetDeviceGroupPresentCapabilitiesKHR(
VkDevice device,
VkDeviceGroupPresentCapabilitiesKHR* pCapabilities)
{
@ -351,7 +365,8 @@ VkResult v3dv_GetDeviceGroupPresentCapabilitiesKHR(
return VK_SUCCESS;
}
VkResult v3dv_GetDeviceGroupSurfacePresentModesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetDeviceGroupSurfacePresentModesKHR(
VkDevice device,
VkSurfaceKHR surface,
VkDeviceGroupPresentModeFlagsKHR* pModes)
@ -361,7 +376,8 @@ VkResult v3dv_GetDeviceGroupSurfacePresentModesKHR(
return VK_SUCCESS;
}
VkResult v3dv_GetPhysicalDevicePresentRectanglesKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDevicePresentRectanglesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pRectCount,

14
src/broadcom/vulkan/v3dv_wsi_display.c
View file

@ -24,7 +24,7 @@
#include "v3dv_private.h"
#include "wsi_common_display.h"
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physical_device,
uint32_t *property_count,
VkDisplayPropertiesKHR *properties)
@ -38,7 +38,7 @@ v3dv_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physical_device,
properties);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetPhysicalDeviceDisplayPlanePropertiesKHR(
VkPhysicalDevice physical_device,
uint32_t *property_count,
@ -53,7 +53,7 @@ v3dv_GetPhysicalDeviceDisplayPlanePropertiesKHR(
properties);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDevice physical_device,
uint32_t plane_index,
uint32_t *display_count,
@ -69,7 +69,7 @@ v3dv_GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDevice physical_device,
displays);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetDisplayModePropertiesKHR(VkPhysicalDevice physical_device,
VkDisplayKHR display,
uint32_t *property_count,
@ -84,7 +84,7 @@ v3dv_GetDisplayModePropertiesKHR(VkPhysicalDevice physical_device,
properties);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateDisplayModeKHR(VkPhysicalDevice physical_device,
VkDisplayKHR display,
const VkDisplayModeCreateInfoKHR *create_info,
@ -101,7 +101,7 @@ v3dv_CreateDisplayModeKHR(VkPhysicalDevice physical_device,
mode);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice physical_device,
VkDisplayModeKHR mode_khr,
uint32_t plane_index,
@ -116,7 +116,7 @@ v3dv_GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice physical_device,
capabilities);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateDisplayPlaneSurfaceKHR(
VkInstance _instance,
const VkDisplaySurfaceCreateInfoKHR *create_info,

6
src/broadcom/vulkan/v3dv_wsi_wayland.c
View file

@ -26,7 +26,8 @@
#include "wsi_common_wayland.h"
#include "v3dv_private.h"
VkBool32 v3dv_GetPhysicalDeviceWaylandPresentationSupportKHR(
VKAPI_ATTR VkBool32 VKAPI_CALL
v3dv_GetPhysicalDeviceWaylandPresentationSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
struct wl_display* display)
@ -36,7 +37,8 @@ VkBool32 v3dv_GetPhysicalDeviceWaylandPresentationSupportKHR(
return wsi_wl_get_presentation_support(&physical_device->wsi_device, display);
}
VkResult v3dv_CreateWaylandSurfaceKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateWaylandSurfaceKHR(
VkInstance _instance,
const VkWaylandSurfaceCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,

12
src/broadcom/vulkan/v3dv_wsi_x11.c
View file

@ -33,7 +33,8 @@
#include "wsi_common_x11.h"
#include "v3dv_private.h"
VkBool32 v3dv_GetPhysicalDeviceXcbPresentationSupportKHR(
VKAPI_ATTR VkBool32 VKAPI_CALL
v3dv_GetPhysicalDeviceXcbPresentationSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
xcb_connection_t* connection,
@ -47,7 +48,8 @@ VkBool32 v3dv_GetPhysicalDeviceXcbPresentationSupportKHR(
connection, visual_id);
}
VkBool32 v3dv_GetPhysicalDeviceXlibPresentationSupportKHR(
VKAPI_ATTR VkBool32 VKAPI_CALL
v3dv_GetPhysicalDeviceXlibPresentationSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
Display* dpy,
@ -61,7 +63,8 @@ VkBool32 v3dv_GetPhysicalDeviceXlibPresentationSupportKHR(
XGetXCBConnection(dpy), visualID);
}
VkResult v3dv_CreateXcbSurfaceKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateXcbSurfaceKHR(
VkInstance _instance,
const VkXcbSurfaceCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -79,7 +82,8 @@ VkResult v3dv_CreateXcbSurfaceKHR(
return wsi_create_xcb_surface(alloc, pCreateInfo, pSurface);
}
VkResult v3dv_CreateXlibSurfaceKHR(
VKAPI_ATTR VkResult VKAPI_CALL
v3dv_CreateXlibSurfaceKHR(
VkInstance _instance,
const VkXlibSurfaceCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,