fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/lavapipe: add missing VKAPI_ATTR/CALL

Browse source 
Acked-by: Jose Fonseca <jfonsec@vmware.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8823>
This commit is contained in:
Michel Zou 2020-10-18 13:08:21 +02:00 • committed by Marge Bot
parent e2608312d3
commit 2ef3dca476
19 changed files with 238 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
src/gallium/frontends/lavapipe/lvp_cmd_buffer.c
View file

@ -74,7 +74,7 @@ static VkResult lvp_reset_cmd_buffer(struct lvp_cmd_buffer *cmd_buffer)
return VK_SUCCESS;
}
VkResult lvp_AllocateCommandBuffers(
VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateCommandBuffers(
VkDevice _device,
const VkCommandBufferAllocateInfo* pAllocateInfo,
VkCommandBuffer* pCommandBuffers)
@ -124,7 +124,7 @@ lvp_cmd_buffer_destroy(struct lvp_cmd_buffer *cmd_buffer)
vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
}
void lvp_FreeCommandBuffers(
VKAPI_ATTR void VKAPI_CALL lvp_FreeCommandBuffers(
VkDevice device,
VkCommandPool commandPool,
uint32_t commandBufferCount,
@ -143,7 +143,7 @@ void lvp_FreeCommandBuffers(
}
}
VkResult lvp_ResetCommandBuffer(
VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetCommandBuffer(
VkCommandBuffer commandBuffer,
VkCommandBufferResetFlags flags)
{
@ -152,7 +152,7 @@ VkResult lvp_ResetCommandBuffer(
return lvp_reset_cmd_buffer(cmd_buffer);
}
VkResult lvp_BeginCommandBuffer(
VKAPI_ATTR VkResult VKAPI_CALL lvp_BeginCommandBuffer(
VkCommandBuffer commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo)
{
@ -167,7 +167,7 @@ VkResult lvp_BeginCommandBuffer(
return VK_SUCCESS;
}
VkResult lvp_EndCommandBuffer(
VKAPI_ATTR VkResult VKAPI_CALL lvp_EndCommandBuffer(
VkCommandBuffer commandBuffer)
{
LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer);
@ -175,7 +175,7 @@ VkResult lvp_EndCommandBuffer(
return VK_SUCCESS;
}
VkResult lvp_CreateCommandPool(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateCommandPool(
VkDevice _device,
const VkCommandPoolCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -204,7 +204,7 @@ VkResult lvp_CreateCommandPool(
return VK_SUCCESS;
}
void lvp_DestroyCommandPool(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyCommandPool(
VkDevice _device,
VkCommandPool commandPool,
const VkAllocationCallbacks* pAllocator)
@ -229,7 +229,7 @@ void lvp_DestroyCommandPool(
vk_free2(&device->vk.alloc, pAllocator, pool);
}
VkResult lvp_ResetCommandPool(
VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetCommandPool(
VkDevice device,
VkCommandPool commandPool,
VkCommandPoolResetFlags flags)
@ -246,7 +246,7 @@ VkResult lvp_ResetCommandPool(
return VK_SUCCESS;
}
void lvp_TrimCommandPool(
VKAPI_ATTR void VKAPI_CALL lvp_TrimCommandPool(
VkDevice device,
VkCommandPool commandPool,
VkCommandPoolTrimFlags flags)
@ -324,7 +324,7 @@ state_setup_attachments(struct lvp_attachment_state *attachments,
}
}
void lvp_CmdBeginRenderPass(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginRenderPass(
VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBegin,
VkSubpassContents contents)
@ -349,7 +349,7 @@ void lvp_CmdBeginRenderPass(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdNextSubpass(
VKAPI_ATTR void VKAPI_CALL lvp_CmdNextSubpass(
VkCommandBuffer commandBuffer,
VkSubpassContents contents)
{
@ -365,7 +365,7 @@ void lvp_CmdNextSubpass(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBindVertexBuffers(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindVertexBuffers(
VkCommandBuffer commandBuffer,
uint32_t firstBinding,
uint32_t bindingCount,
@ -398,7 +398,7 @@ void lvp_CmdBindVertexBuffers(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBindPipeline(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindPipeline(
VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipeline _pipeline)
@ -417,7 +417,7 @@ void lvp_CmdBindPipeline(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBindDescriptorSets(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindDescriptorSets(
VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipelineLayout _layout,
@ -459,7 +459,7 @@ void lvp_CmdBindDescriptorSets(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDraw(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDraw(
VkCommandBuffer commandBuffer,
uint32_t vertexCount,
uint32_t instanceCount,
@ -481,7 +481,7 @@ void lvp_CmdDraw(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdEndRenderPass(
VKAPI_ATTR void VKAPI_CALL lvp_CmdEndRenderPass(
VkCommandBuffer commandBuffer)
{
LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer);
@ -494,7 +494,7 @@ void lvp_CmdEndRenderPass(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetViewport(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetViewport(
VkCommandBuffer commandBuffer,
uint32_t firstViewport,
uint32_t viewportCount,
@ -516,7 +516,7 @@ void lvp_CmdSetViewport(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetScissor(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetScissor(
VkCommandBuffer commandBuffer,
uint32_t firstScissor,
uint32_t scissorCount,
@ -538,7 +538,7 @@ void lvp_CmdSetScissor(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetLineWidth(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetLineWidth(
VkCommandBuffer commandBuffer,
float lineWidth)
{
@ -554,7 +554,7 @@ void lvp_CmdSetLineWidth(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetDepthBias(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetDepthBias(
VkCommandBuffer commandBuffer,
float depthBiasConstantFactor,
float depthBiasClamp,
@ -574,7 +574,7 @@ void lvp_CmdSetDepthBias(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetBlendConstants(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetBlendConstants(
VkCommandBuffer commandBuffer,
const float blendConstants[4])
{
@ -590,7 +590,7 @@ void lvp_CmdSetBlendConstants(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetDepthBounds(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetDepthBounds(
VkCommandBuffer commandBuffer,
float minDepthBounds,
float maxDepthBounds)
@ -608,7 +608,7 @@ void lvp_CmdSetDepthBounds(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetStencilCompareMask(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetStencilCompareMask(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t compareMask)
@ -626,7 +626,7 @@ void lvp_CmdSetStencilCompareMask(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetStencilWriteMask(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetStencilWriteMask(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t writeMask)
@ -645,7 +645,7 @@ void lvp_CmdSetStencilWriteMask(
}
void lvp_CmdSetStencilReference(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetStencilReference(
VkCommandBuffer commandBuffer,
VkStencilFaceFlags faceMask,
uint32_t reference)
@ -663,7 +663,7 @@ void lvp_CmdSetStencilReference(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdPushConstants(
VKAPI_ATTR void VKAPI_CALL lvp_CmdPushConstants(
VkCommandBuffer commandBuffer,
VkPipelineLayout layout,
VkShaderStageFlags stageFlags,
@ -686,7 +686,7 @@ void lvp_CmdPushConstants(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBindIndexBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindIndexBuffer(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -707,7 +707,7 @@ void lvp_CmdBindIndexBuffer(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndexed(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndexed(
VkCommandBuffer commandBuffer,
uint32_t indexCount,
uint32_t instanceCount,
@ -731,7 +731,7 @@ void lvp_CmdDrawIndexed(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndirect(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndirect(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -754,7 +754,7 @@ void lvp_CmdDrawIndirect(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndexedIndirect(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndexedIndirect(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -777,7 +777,7 @@ void lvp_CmdDrawIndexedIndirect(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDispatch(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDispatch(
VkCommandBuffer commandBuffer,
uint32_t x,
uint32_t y,
@ -800,7 +800,7 @@ void lvp_CmdDispatch(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDispatchIndirect(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDispatchIndirect(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset)
@ -818,7 +818,7 @@ void lvp_CmdDispatchIndirect(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdExecuteCommands(
VKAPI_ATTR void VKAPI_CALL lvp_CmdExecuteCommands(
VkCommandBuffer commandBuffer,
uint32_t commandBufferCount,
const VkCommandBuffer* pCmdBuffers)
@ -838,7 +838,7 @@ void lvp_CmdExecuteCommands(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetEvent(VkCommandBuffer commandBuffer,
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetEvent(VkCommandBuffer commandBuffer,
VkEvent _event,
VkPipelineStageFlags stageMask)
{
@ -857,7 +857,7 @@ void lvp_CmdSetEvent(VkCommandBuffer commandBuffer,
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdResetEvent(VkCommandBuffer commandBuffer,
VKAPI_ATTR void VKAPI_CALL lvp_CmdResetEvent(VkCommandBuffer commandBuffer,
VkEvent _event,
VkPipelineStageFlags stageMask)
{
@ -877,7 +877,7 @@ void lvp_CmdResetEvent(VkCommandBuffer commandBuffer,
}
void lvp_CmdWaitEvents(VkCommandBuffer commandBuffer,
VKAPI_ATTR void VKAPI_CALL lvp_CmdWaitEvents(VkCommandBuffer commandBuffer,
uint32_t eventCount,
const VkEvent* pEvents,
VkPipelineStageFlags srcStageMask,
@ -917,7 +917,7 @@ void lvp_CmdWaitEvents(VkCommandBuffer commandBuffer,
}
void lvp_CmdCopyBufferToImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdCopyBufferToImage(
VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkImage destImage,
@ -951,7 +951,7 @@ void lvp_CmdCopyBufferToImage(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdCopyImageToBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_CmdCopyImageToBuffer(
VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -985,7 +985,7 @@ void lvp_CmdCopyImageToBuffer(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdCopyImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdCopyImage(
VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -1022,7 +1022,7 @@ void lvp_CmdCopyImage(
}
void lvp_CmdCopyBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_CmdCopyBuffer(
VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkBuffer destBuffer,
@ -1054,7 +1054,7 @@ void lvp_CmdCopyBuffer(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBlitImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBlitImage(
VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -1092,7 +1092,7 @@ void lvp_CmdBlitImage(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdClearAttachments(
VKAPI_ATTR void VKAPI_CALL lvp_CmdClearAttachments(
VkCommandBuffer commandBuffer,
uint32_t attachmentCount,
const VkClearAttachment* pAttachments,
@ -1119,7 +1119,7 @@ void lvp_CmdClearAttachments(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdFillBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_CmdFillBuffer(
VkCommandBuffer commandBuffer,
VkBuffer dstBuffer,
VkDeviceSize dstOffset,
@ -1142,7 +1142,7 @@ void lvp_CmdFillBuffer(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdUpdateBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_CmdUpdateBuffer(
VkCommandBuffer commandBuffer,
VkBuffer dstBuffer,
VkDeviceSize dstOffset,
@ -1165,7 +1165,7 @@ void lvp_CmdUpdateBuffer(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdClearColorImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdClearColorImage(
VkCommandBuffer commandBuffer,
VkImage image_h,
VkImageLayout imageLayout,
@ -1193,7 +1193,7 @@ void lvp_CmdClearColorImage(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdClearDepthStencilImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdClearDepthStencilImage(
VkCommandBuffer commandBuffer,
VkImage image_h,
VkImageLayout imageLayout,
@ -1222,7 +1222,7 @@ void lvp_CmdClearDepthStencilImage(
}
void lvp_CmdResolveImage(
VKAPI_ATTR void VKAPI_CALL lvp_CmdResolveImage(
VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -1253,7 +1253,7 @@ void lvp_CmdResolveImage(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdResetQueryPool(
VKAPI_ATTR void VKAPI_CALL lvp_CmdResetQueryPool(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
@ -1274,7 +1274,7 @@ void lvp_CmdResetQueryPool(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBeginQueryIndexedEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginQueryIndexedEXT(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query,
@ -1297,7 +1297,7 @@ void lvp_CmdBeginQueryIndexedEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBeginQuery(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginQuery(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query,
@ -1306,7 +1306,7 @@ void lvp_CmdBeginQuery(
lvp_CmdBeginQueryIndexedEXT(commandBuffer, queryPool, query, flags, 0);
}
void lvp_CmdEndQueryIndexedEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdEndQueryIndexedEXT(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query,
@ -1327,7 +1327,7 @@ void lvp_CmdEndQueryIndexedEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdEndQuery(
VKAPI_ATTR void VKAPI_CALL lvp_CmdEndQuery(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t query)
@ -1335,7 +1335,7 @@ void lvp_CmdEndQuery(
lvp_CmdEndQueryIndexedEXT(commandBuffer, queryPool, query, 0);
}
void lvp_CmdWriteTimestamp(
VKAPI_ATTR void VKAPI_CALL lvp_CmdWriteTimestamp(
VkCommandBuffer commandBuffer,
VkPipelineStageFlagBits pipelineStage,
VkQueryPool queryPool,
@ -1356,7 +1356,7 @@ void lvp_CmdWriteTimestamp(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdCopyQueryPoolResults(
VKAPI_ATTR void VKAPI_CALL lvp_CmdCopyQueryPoolResults(
VkCommandBuffer commandBuffer,
VkQueryPool queryPool,
uint32_t firstQuery,
@ -1386,7 +1386,7 @@ void lvp_CmdCopyQueryPoolResults(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdPipelineBarrier(
VKAPI_ATTR void VKAPI_CALL lvp_CmdPipelineBarrier(
VkCommandBuffer commandBuffer,
VkPipelineStageFlags srcStageMask,
VkPipelineStageFlags destStageMask,
@ -1421,7 +1421,7 @@ void lvp_CmdPipelineBarrier(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndirectCount(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndirectCount(
VkCommandBuffer commandBuffer,
VkBuffer buffer,
VkDeviceSize offset,
@ -1449,7 +1449,7 @@ void lvp_CmdDrawIndirectCount(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndexedIndirectCount(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndexedIndirectCount(
VkCommandBuffer commandBuffer,
VkBuffer buffer,
VkDeviceSize offset,
@ -1477,7 +1477,7 @@ void lvp_CmdDrawIndexedIndirectCount(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdPushDescriptorSetKHR(
VKAPI_ATTR void VKAPI_CALL lvp_CmdPushDescriptorSetKHR(
VkCommandBuffer commandBuffer,
VkPipelineBindPoint pipelineBindPoint,
VkPipelineLayout _layout,
@ -1557,7 +1557,7 @@ void lvp_CmdPushDescriptorSetKHR(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdPushDescriptorSetWithTemplateKHR(
VKAPI_ATTR void VKAPI_CALL lvp_CmdPushDescriptorSetWithTemplateKHR(
VkCommandBuffer commandBuffer,
VkDescriptorUpdateTemplate descriptorUpdateTemplate,
VkPipelineLayout _layout,
@ -1646,7 +1646,7 @@ void lvp_CmdPushDescriptorSetWithTemplateKHR(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBindTransformFeedbackBuffersEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindTransformFeedbackBuffersEXT(
VkCommandBuffer commandBuffer,
uint32_t firstBinding,
uint32_t bindingCount,
@ -1678,7 +1678,7 @@ void lvp_CmdBindTransformFeedbackBuffersEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBeginTransformFeedbackEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginTransformFeedbackEXT(
VkCommandBuffer commandBuffer,
uint32_t firstCounterBuffer,
uint32_t counterBufferCount,
@ -1710,7 +1710,7 @@ void lvp_CmdBeginTransformFeedbackEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdEndTransformFeedbackEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdEndTransformFeedbackEXT(
VkCommandBuffer commandBuffer,
uint32_t firstCounterBuffer,
uint32_t counterBufferCount,
@ -1742,7 +1742,7 @@ void lvp_CmdEndTransformFeedbackEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdDrawIndirectByteCountEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDrawIndirectByteCountEXT(
VkCommandBuffer commandBuffer,
uint32_t instanceCount,
uint32_t firstInstance,
@ -1768,14 +1768,14 @@ void lvp_CmdDrawIndirectByteCountEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdSetDeviceMask(
VKAPI_ATTR void VKAPI_CALL lvp_CmdSetDeviceMask(
VkCommandBuffer commandBuffer,
uint32_t deviceMask)
{
/* No-op */
}
void lvp_CmdDispatchBase(
VKAPI_ATTR void VKAPI_CALL lvp_CmdDispatchBase(
VkCommandBuffer commandBuffer,
uint32_t base_x,
uint32_t base_y,
@ -1800,7 +1800,7 @@ void lvp_CmdDispatchBase(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdBeginConditionalRenderingEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdBeginConditionalRenderingEXT(
VkCommandBuffer commandBuffer,
const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin)
{
@ -1816,7 +1816,7 @@ void lvp_CmdBeginConditionalRenderingEXT(
cmd_buf_queue(cmd_buffer, cmd);
}
void lvp_CmdEndConditionalRenderingEXT(
VKAPI_ATTR void VKAPI_CALL lvp_CmdEndConditionalRenderingEXT(
VkCommandBuffer commandBuffer)
{
LVP_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer);

28
src/gallium/frontends/lavapipe/lvp_descriptor_set.c
View file

@ -25,7 +25,7 @@
#include "vk_util.h"
#include "u_math.h"
VkResult lvp_CreateDescriptorSetLayout(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorSetLayout(
VkDevice _device,
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -156,7 +156,7 @@ VkResult lvp_CreateDescriptorSetLayout(
return VK_SUCCESS;
}
void lvp_DestroyDescriptorSetLayout(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyDescriptorSetLayout(
VkDevice _device,
VkDescriptorSetLayout _set_layout,
const VkAllocationCallbacks* pAllocator)
@ -170,7 +170,7 @@ void lvp_DestroyDescriptorSetLayout(
vk_free2(&device->vk.alloc, pAllocator, set_layout);
}
VkResult lvp_CreatePipelineLayout(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePipelineLayout(
VkDevice _device,
const VkPipelineLayoutCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -208,7 +208,7 @@ VkResult lvp_CreatePipelineLayout(
return VK_SUCCESS;
}
void lvp_DestroyPipelineLayout(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyPipelineLayout(
VkDevice _device,
VkPipelineLayout _pipelineLayout,
const VkAllocationCallbacks* pAllocator)
@ -267,7 +267,7 @@ lvp_descriptor_set_destroy(struct lvp_device *device,
vk_free(&device->vk.alloc, set);
}
VkResult lvp_AllocateDescriptorSets(
VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateDescriptorSets(
VkDevice _device,
const VkDescriptorSetAllocateInfo* pAllocateInfo,
VkDescriptorSet* pDescriptorSets)
@ -297,7 +297,7 @@ VkResult lvp_AllocateDescriptorSets(
return result;
}
VkResult lvp_FreeDescriptorSets(
VKAPI_ATTR VkResult VKAPI_CALL lvp_FreeDescriptorSets(
VkDevice _device,
VkDescriptorPool descriptorPool,
uint32_t count,
@ -315,7 +315,7 @@ VkResult lvp_FreeDescriptorSets(
return VK_SUCCESS;
}
void lvp_UpdateDescriptorSets(
VKAPI_ATTR void VKAPI_CALL lvp_UpdateDescriptorSets(
VkDevice _device,
uint32_t descriptorWriteCount,
const VkWriteDescriptorSet* pDescriptorWrites,
@ -433,7 +433,7 @@ void lvp_UpdateDescriptorSets(
}
}
VkResult lvp_CreateDescriptorPool(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorPool(
VkDevice _device,
const VkDescriptorPoolCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -465,7 +465,7 @@ static void lvp_reset_descriptor_pool(struct lvp_device *device,
}
}
void lvp_DestroyDescriptorPool(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyDescriptorPool(
VkDevice _device,
VkDescriptorPool _pool,
const VkAllocationCallbacks* pAllocator)
@ -481,7 +481,7 @@ void lvp_DestroyDescriptorPool(
vk_free2(&device->vk.alloc, pAllocator, pool);
}
VkResult lvp_ResetDescriptorPool(
VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetDescriptorPool(
VkDevice _device,
VkDescriptorPool _pool,
VkDescriptorPoolResetFlags flags)
@ -493,14 +493,14 @@ VkResult lvp_ResetDescriptorPool(
return VK_SUCCESS;
}
void lvp_GetDescriptorSetLayoutSupport(VkDevice device,
VKAPI_ATTR void VKAPI_CALL lvp_GetDescriptorSetLayoutSupport(VkDevice device,
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
VkDescriptorSetLayoutSupport* pSupport)
{
}
VkResult lvp_CreateDescriptorUpdateTemplate(VkDevice _device,
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorUpdateTemplate(VkDevice _device,
const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
VkDescriptorUpdateTemplate *pDescriptorUpdateTemplate)
@ -536,7 +536,7 @@ VkResult lvp_CreateDescriptorUpdateTemplate(VkDevice _device,
return VK_SUCCESS;
}
void lvp_DestroyDescriptorUpdateTemplate(VkDevice _device,
VKAPI_ATTR void VKAPI_CALL lvp_DestroyDescriptorUpdateTemplate(VkDevice _device,
VkDescriptorUpdateTemplate descriptorUpdateTemplate,
const VkAllocationCallbacks *pAllocator)
{
@ -550,7 +550,7 @@ void lvp_DestroyDescriptorUpdateTemplate(VkDevice _device,
vk_free2(&device->vk.alloc, pAllocator, templ);
}
void lvp_UpdateDescriptorSetWithTemplate(VkDevice _device,
VKAPI_ATTR void VKAPI_CALL lvp_UpdateDescriptorSetWithTemplate(VkDevice _device,
VkDescriptorSet descriptorSet,
VkDescriptorUpdateTemplate descriptorUpdateTemplate,
const void *pData)

143
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -38,7 +38,7 @@
#include "util/timespec.h"
#include "os_time.h"
static VkResult
static VkResult VKAPI_CALL
lvp_physical_device_init(struct lvp_physical_device *device,
struct lvp_instance *instance,
struct pipe_loader_device *pld)
@ -74,7 +74,7 @@ lvp_physical_device_init(struct lvp_physical_device *device,
return result;
}
static void
static void VKAPI_CALL
lvp_physical_device_finish(struct lvp_physical_device *device)
{
lvp_finish_wsi(device);
@ -82,21 +82,21 @@ lvp_physical_device_finish(struct lvp_physical_device *device)
vk_physical_device_finish(&device->vk);
}
static void *
static void * VKAPI_CALL
default_alloc_func(void *pUserData, size_t size, size_t align,
VkSystemAllocationScope allocationScope)
{
return os_malloc_aligned(size, align);
}
static void *
static 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 void VKAPI_CALL
default_free_func(void *pUserData, void *pMemory)
{
os_free_aligned(pMemory);
@ -109,7 +109,7 @@ static const VkAllocationCallbacks default_alloc = {
.pfnFree = default_free_func,
};
VkResult lvp_CreateInstance(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateInstance(
const VkInstanceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
VkInstance* pInstance)
@ -161,7 +161,7 @@ VkResult lvp_CreateInstance(
return VK_SUCCESS;
}
void lvp_DestroyInstance(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyInstance(
VkInstance _instance,
const VkAllocationCallbacks* pAllocator)
{
@ -206,7 +206,7 @@ static struct drisw_loader_funcs lvp_sw_lf = {
.put_image2 = lvp_put_image2,
};
VkResult lvp_EnumeratePhysicalDevices(
VKAPI_ATTR VkResult VKAPI_CALL lvp_EnumeratePhysicalDevices(
VkInstance _instance,
uint32_t* pPhysicalDeviceCount,
VkPhysicalDevice* pPhysicalDevices)
@ -247,7 +247,7 @@ VkResult lvp_EnumeratePhysicalDevices(
return VK_SUCCESS;
}
void lvp_GetPhysicalDeviceFeatures(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures* pFeatures)
{
@ -303,7 +303,7 @@ void lvp_GetPhysicalDeviceFeatures(
};
}
void lvp_GetPhysicalDeviceFeatures2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2 *pFeatures)
{
@ -379,7 +379,7 @@ lvp_device_get_cache_uuid(void *uuid)
snprintf(uuid, VK_UUID_SIZE, "val-%s", MESA_GIT_SHA1 + 4);
}
void lvp_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties *pProperties)
{
LVP_FROM_HANDLE(lvp_physical_device, pdevice, physicalDevice);
@ -524,7 +524,7 @@ void lvp_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
}
void lvp_GetPhysicalDeviceProperties2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2 *pProperties)
{
@ -612,7 +612,7 @@ static void lvp_get_physical_device_queue_family_properties(
};
}
void lvp_GetPhysicalDeviceQueueFamilyProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkQueueFamilyProperties* pQueueFamilyProperties)
@ -626,7 +626,7 @@ void lvp_GetPhysicalDeviceQueueFamilyProperties(
lvp_get_physical_device_queue_family_properties(pQueueFamilyProperties);
}
void lvp_GetPhysicalDeviceQueueFamilyProperties2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceQueueFamilyProperties2(
VkPhysicalDevice physicalDevice,
uint32_t* pCount,
VkQueueFamilyProperties2 *pQueueFamilyProperties)
@ -640,7 +640,7 @@ void lvp_GetPhysicalDeviceQueueFamilyProperties2(
lvp_get_physical_device_queue_family_properties(&pQueueFamilyProperties->queueFamilyProperties);
}
void lvp_GetPhysicalDeviceMemoryProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceMemoryProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties* pMemoryProperties)
{
@ -660,7 +660,7 @@ void lvp_GetPhysicalDeviceMemoryProperties(
};
}
void lvp_GetPhysicalDeviceMemoryProperties2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceMemoryProperties2(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2 *pMemoryProperties)
{
@ -668,7 +668,7 @@ void lvp_GetPhysicalDeviceMemoryProperties2(
&pMemoryProperties->memoryProperties);
}
PFN_vkVoidFunction lvp_GetInstanceProcAddr(
VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr(
VkInstance _instance,
const char* pName)
{
@ -771,7 +771,7 @@ lvp_queue_finish(struct lvp_queue *queue)
queue->ctx->destroy(queue->ctx);
}
VkResult lvp_CreateDevice(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDevice(
VkPhysicalDevice physicalDevice,
const VkDeviceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -830,7 +830,7 @@ VkResult lvp_CreateDevice(
}
void lvp_DestroyDevice(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyDevice(
VkDevice _device,
const VkAllocationCallbacks* pAllocator)
{
@ -841,7 +841,7 @@ void lvp_DestroyDevice(
vk_free(&device->vk.alloc, device);
}
VkResult lvp_EnumerateInstanceExtensionProperties(
VKAPI_ATTR VkResult VKAPI_CALL lvp_EnumerateInstanceExtensionProperties(
const char* pLayerName,
uint32_t* pPropertyCount,
VkExtensionProperties* pProperties)
@ -853,7 +853,7 @@ VkResult lvp_EnumerateInstanceExtensionProperties(
&lvp_instance_extensions_supported, pPropertyCount, pProperties);
}
VkResult lvp_EnumerateInstanceLayerProperties(
VKAPI_ATTR VkResult VKAPI_CALL lvp_EnumerateInstanceLayerProperties(
uint32_t* pPropertyCount,
VkLayerProperties* pProperties)
{
@ -866,7 +866,7 @@ VkResult lvp_EnumerateInstanceLayerProperties(
return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT);
}
VkResult lvp_EnumerateDeviceLayerProperties(
VKAPI_ATTR VkResult VKAPI_CALL lvp_EnumerateDeviceLayerProperties(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
VkLayerProperties* pProperties)
@ -880,7 +880,7 @@ VkResult lvp_EnumerateDeviceLayerProperties(
return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT);
}
void lvp_GetDeviceQueue2(
VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceQueue2(
VkDevice _device,
const VkDeviceQueueInfo2* pQueueInfo,
VkQueue* pQueue)
@ -906,7 +906,7 @@ void lvp_GetDeviceQueue2(
}
void lvp_GetDeviceQueue(
VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceQueue(
VkDevice _device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
@ -922,7 +922,7 @@ void lvp_GetDeviceQueue(
}
VkResult lvp_QueueSubmit(
VKAPI_ATTR VkResult VKAPI_CALL lvp_QueueSubmit(
VkQueue _queue,
uint32_t submitCount,
const VkSubmitInfo* pSubmits,
@ -976,7 +976,7 @@ static VkResult queue_wait_idle(struct lvp_queue *queue, uint64_t timeout)
return VK_SUCCESS;
}
VkResult lvp_QueueWaitIdle(
VKAPI_ATTR VkResult VKAPI_CALL lvp_QueueWaitIdle(
VkQueue _queue)
{
LVP_FROM_HANDLE(lvp_queue, queue, _queue);
@ -984,7 +984,7 @@ VkResult lvp_QueueWaitIdle(
return queue_wait_idle(queue, UINT64_MAX);
}
VkResult lvp_DeviceWaitIdle(
VKAPI_ATTR VkResult VKAPI_CALL lvp_DeviceWaitIdle(
VkDevice _device)
{
LVP_FROM_HANDLE(lvp_device, device, _device);
@ -992,7 +992,7 @@ VkResult lvp_DeviceWaitIdle(
return queue_wait_idle(&device->queue, UINT64_MAX);
}
VkResult lvp_AllocateMemory(
VKAPI_ATTR VkResult VKAPI_CALL lvp_AllocateMemory(
VkDevice _device,
const VkMemoryAllocateInfo* pAllocateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1028,7 +1028,7 @@ VkResult lvp_AllocateMemory(
return VK_SUCCESS;
}
void lvp_FreeMemory(
VKAPI_ATTR void VKAPI_CALL lvp_FreeMemory(
VkDevice _device,
VkDeviceMemory _mem,
const VkAllocationCallbacks* pAllocator)
@ -1045,7 +1045,7 @@ void lvp_FreeMemory(
}
VkResult lvp_MapMemory(
VKAPI_ATTR VkResult VKAPI_CALL lvp_MapMemory(
VkDevice _device,
VkDeviceMemory _memory,
VkDeviceSize offset,
@ -1067,7 +1067,7 @@ VkResult lvp_MapMemory(
return VK_SUCCESS;
}
void lvp_UnmapMemory(
VKAPI_ATTR void VKAPI_CALL lvp_UnmapMemory(
VkDevice _device,
VkDeviceMemory _memory)
{
@ -1080,14 +1080,7 @@ void lvp_UnmapMemory(
device->pscreen->unmap_memory(device->pscreen, mem->pmem);
}
VkResult lvp_FlushMappedMemoryRanges(
VkDevice _device,
uint32_t memoryRangeCount,
const VkMappedMemoryRange* pMemoryRanges)
{
return VK_SUCCESS;
}
VkResult lvp_InvalidateMappedMemoryRanges(
VKAPI_ATTR VkResult VKAPI_CALL lvp_FlushMappedMemoryRanges(
VkDevice _device,
uint32_t memoryRangeCount,
const VkMappedMemoryRange* pMemoryRanges)
@ -1095,7 +1088,15 @@ VkResult lvp_InvalidateMappedMemoryRanges(
return VK_SUCCESS;
}
void lvp_GetBufferMemoryRequirements(
VKAPI_ATTR VkResult VKAPI_CALL lvp_InvalidateMappedMemoryRanges(
VkDevice _device,
uint32_t memoryRangeCount,
const VkMappedMemoryRange* pMemoryRanges)
{
return VK_SUCCESS;
}
VKAPI_ATTR void VKAPI_CALL lvp_GetBufferMemoryRequirements(
VkDevice device,
VkBuffer _buffer,
VkMemoryRequirements* pMemoryRequirements)
@ -1117,7 +1118,7 @@ void lvp_GetBufferMemoryRequirements(
pMemoryRequirements->alignment = 64;
}
void lvp_GetBufferMemoryRequirements2(
VKAPI_ATTR void VKAPI_CALL lvp_GetBufferMemoryRequirements2(
VkDevice device,
const VkBufferMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@ -1139,7 +1140,7 @@ void lvp_GetBufferMemoryRequirements2(
}
}
void lvp_GetImageMemoryRequirements(
VKAPI_ATTR void VKAPI_CALL lvp_GetImageMemoryRequirements(
VkDevice device,
VkImage _image,
VkMemoryRequirements* pMemoryRequirements)
@ -1151,7 +1152,7 @@ void lvp_GetImageMemoryRequirements(
pMemoryRequirements->alignment = image->alignment;
}
void lvp_GetImageMemoryRequirements2(
VKAPI_ATTR void VKAPI_CALL lvp_GetImageMemoryRequirements2(
VkDevice device,
const VkImageMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@ -1174,7 +1175,7 @@ void lvp_GetImageMemoryRequirements2(
}
}
void lvp_GetImageSparseMemoryRequirements(
VKAPI_ATTR void VKAPI_CALL lvp_GetImageSparseMemoryRequirements(
VkDevice device,
VkImage image,
uint32_t* pSparseMemoryRequirementCount,
@ -1183,7 +1184,7 @@ void lvp_GetImageSparseMemoryRequirements(
stub();
}
void lvp_GetImageSparseMemoryRequirements2(
VKAPI_ATTR void VKAPI_CALL lvp_GetImageSparseMemoryRequirements2(
VkDevice device,
const VkImageSparseMemoryRequirementsInfo2* pInfo,
uint32_t* pSparseMemoryRequirementCount,
@ -1192,7 +1193,7 @@ void lvp_GetImageSparseMemoryRequirements2(
stub();
}
void lvp_GetDeviceMemoryCommitment(
VKAPI_ATTR void VKAPI_CALL lvp_GetDeviceMemoryCommitment(
VkDevice device,
VkDeviceMemory memory,
VkDeviceSize* pCommittedMemoryInBytes)
@ -1200,7 +1201,7 @@ void lvp_GetDeviceMemoryCommitment(
*pCommittedMemoryInBytes = 0;
}
VkResult lvp_BindBufferMemory2(VkDevice _device,
VKAPI_ATTR VkResult VKAPI_CALL lvp_BindBufferMemory2(VkDevice _device,
uint32_t bindInfoCount,
const VkBindBufferMemoryInfo *pBindInfos)
{
@ -1217,7 +1218,7 @@ VkResult lvp_BindBufferMemory2(VkDevice _device,
return VK_SUCCESS;
}
VkResult lvp_BindImageMemory2(VkDevice _device,
VKAPI_ATTR VkResult VKAPI_CALL lvp_BindImageMemory2(VkDevice _device,
uint32_t bindInfoCount,
const VkBindImageMemoryInfo *pBindInfos)
{
@ -1234,7 +1235,7 @@ VkResult lvp_BindImageMemory2(VkDevice _device,
return VK_SUCCESS;
}
VkResult lvp_QueueBindSparse(
VKAPI_ATTR VkResult VKAPI_CALL lvp_QueueBindSparse(
VkQueue queue,
uint32_t bindInfoCount,
const VkBindSparseInfo* pBindInfo,
@ -1244,7 +1245,7 @@ VkResult lvp_QueueBindSparse(
}
VkResult lvp_CreateFence(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateFence(
VkDevice _device,
const VkFenceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1267,7 +1268,7 @@ VkResult lvp_CreateFence(
return VK_SUCCESS;
}
void lvp_DestroyFence(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyFence(
VkDevice _device,
VkFence _fence,
const VkAllocationCallbacks* pAllocator)
@ -1284,7 +1285,7 @@ void lvp_DestroyFence(
vk_free2(&device->vk.alloc, pAllocator, fence);
}
VkResult lvp_ResetFences(
VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetFences(
VkDevice _device,
uint32_t fenceCount,
const VkFence* pFences)
@ -1303,7 +1304,7 @@ VkResult lvp_ResetFences(
return VK_SUCCESS;
}
VkResult lvp_GetFenceStatus(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetFenceStatus(
VkDevice _device,
VkFence _fence)
{
@ -1331,7 +1332,7 @@ VkResult lvp_GetFenceStatus(
return VK_NOT_READY;
}
VkResult lvp_CreateFramebuffer(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateFramebuffer(
VkDevice _device,
const VkFramebufferCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1366,7 +1367,7 @@ VkResult lvp_CreateFramebuffer(
return VK_SUCCESS;
}
void lvp_DestroyFramebuffer(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyFramebuffer(
VkDevice _device,
VkFramebuffer _fb,
const VkAllocationCallbacks* pAllocator)
@ -1380,7 +1381,7 @@ void lvp_DestroyFramebuffer(
vk_free2(&device->vk.alloc, pAllocator, fb);
}
VkResult lvp_WaitForFences(
VKAPI_ATTR VkResult VKAPI_CALL lvp_WaitForFences(
VkDevice _device,
uint32_t fenceCount,
const VkFence* pFences,
@ -1420,7 +1421,7 @@ VkResult lvp_WaitForFences(
return timeout_status ? VK_TIMEOUT : VK_SUCCESS;
}
VkResult lvp_CreateSemaphore(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSemaphore(
VkDevice _device,
const VkSemaphoreCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1441,7 +1442,7 @@ VkResult lvp_CreateSemaphore(
return VK_SUCCESS;
}
void lvp_DestroySemaphore(
VKAPI_ATTR void VKAPI_CALL lvp_DestroySemaphore(
VkDevice _device,
VkSemaphore _semaphore,
const VkAllocationCallbacks* pAllocator)
@ -1455,7 +1456,7 @@ void lvp_DestroySemaphore(
vk_free2(&device->vk.alloc, pAllocator, semaphore);
}
VkResult lvp_CreateEvent(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateEvent(
VkDevice _device,
const VkEventCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1475,7 +1476,7 @@ VkResult lvp_CreateEvent(
return VK_SUCCESS;
}
void lvp_DestroyEvent(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyEvent(
VkDevice _device,
VkEvent _event,
const VkAllocationCallbacks* pAllocator)
@ -1490,7 +1491,7 @@ void lvp_DestroyEvent(
vk_free2(&device->vk.alloc, pAllocator, event);
}
VkResult lvp_GetEventStatus(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetEventStatus(
VkDevice _device,
VkEvent _event)
{
@ -1500,7 +1501,7 @@ VkResult lvp_GetEventStatus(
return VK_EVENT_RESET;
}
VkResult lvp_SetEvent(
VKAPI_ATTR VkResult VKAPI_CALL lvp_SetEvent(
VkDevice _device,
VkEvent _event)
{
@ -1510,7 +1511,7 @@ VkResult lvp_SetEvent(
return VK_SUCCESS;
}
VkResult lvp_ResetEvent(
VKAPI_ATTR VkResult VKAPI_CALL lvp_ResetEvent(
VkDevice _device,
VkEvent _event)
{
@ -1520,7 +1521,7 @@ VkResult lvp_ResetEvent(
return VK_SUCCESS;
}
VkResult lvp_CreateSampler(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
VkDevice _device,
const VkSamplerCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1544,7 +1545,7 @@ VkResult lvp_CreateSampler(
return VK_SUCCESS;
}
void lvp_DestroySampler(
VKAPI_ATTR void VKAPI_CALL lvp_DestroySampler(
VkDevice _device,
VkSampler _sampler,
const VkAllocationCallbacks* pAllocator)
@ -1605,7 +1606,7 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion)
return VK_SUCCESS;
}
VkResult lvp_CreatePrivateDataSlotEXT(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePrivateDataSlotEXT(
VkDevice _device,
const VkPrivateDataSlotCreateInfoEXT* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -1616,7 +1617,7 @@ VkResult lvp_CreatePrivateDataSlotEXT(
pPrivateDataSlot);
}
void lvp_DestroyPrivateDataSlotEXT(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyPrivateDataSlotEXT(
VkDevice _device,
VkPrivateDataSlotEXT privateDataSlot,
const VkAllocationCallbacks* pAllocator)
@ -1625,7 +1626,7 @@ void lvp_DestroyPrivateDataSlotEXT(
vk_private_data_slot_destroy(&device->vk, privateDataSlot, pAllocator);
}
VkResult lvp_SetPrivateDataEXT(
VKAPI_ATTR VkResult VKAPI_CALL lvp_SetPrivateDataEXT(
VkDevice _device,
VkObjectType objectType,
uint64_t objectHandle,
@ -1638,7 +1639,7 @@ VkResult lvp_SetPrivateDataEXT(
data);
}
void lvp_GetPrivateDataEXT(
VKAPI_ATTR void VKAPI_CALL lvp_GetPrivateDataEXT(
VkDevice _device,
VkObjectType objectType,
uint64_t objectHandle,
@ -1650,7 +1651,7 @@ void lvp_GetPrivateDataEXT(
privateDataSlot, pData);
}
void lvp_GetPhysicalDeviceExternalFenceProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceExternalFenceProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo,
VkExternalFenceProperties *pExternalFenceProperties)
@ -1660,7 +1661,7 @@ void lvp_GetPhysicalDeviceExternalFenceProperties(
pExternalFenceProperties->externalFenceFeatures = 0;
}
void lvp_GetPhysicalDeviceExternalSemaphoreProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceExternalSemaphoreProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo,
VkExternalSemaphoreProperties *pExternalSemaphoreProperties)

10
src/gallium/frontends/lavapipe/lvp_formats.c
View file

@ -236,7 +236,7 @@ lvp_physical_device_get_format_properties(struct lvp_physical_device *physical_d
return;
}
void lvp_GetPhysicalDeviceFormatProperties2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFormatProperties2(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties2* pFormatProperties)
@ -370,7 +370,7 @@ static VkResult lvp_get_image_format_properties(struct lvp_physical_device *phys
return VK_ERROR_FORMAT_NOT_SUPPORTED;
}
VkResult lvp_GetPhysicalDeviceImageFormatProperties2(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2 *base_info,
VkImageFormatProperties2 *base_props)
@ -415,7 +415,7 @@ VkResult lvp_GetPhysicalDeviceImageFormatProperties2(
return VK_SUCCESS;
}
void lvp_GetPhysicalDeviceSparseImageFormatProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceSparseImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,
@ -429,7 +429,7 @@ void lvp_GetPhysicalDeviceSparseImageFormatProperties(
*pNumProperties = 0;
}
void lvp_GetPhysicalDeviceSparseImageFormatProperties2(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo,
uint32_t *pPropertyCount,
@ -439,7 +439,7 @@ void lvp_GetPhysicalDeviceSparseImageFormatProperties2(
*pPropertyCount = 0;
}
void lvp_GetPhysicalDeviceExternalBufferProperties(
VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo,
VkExternalBufferProperties *pExternalBufferProperties)

18
src/gallium/frontends/lavapipe/lvp_image.c
View file

@ -92,7 +92,7 @@ lvp_image_create(VkDevice _device,
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
lvp_CreateImage(VkDevice device,
const VkImageCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -107,7 +107,7 @@ lvp_CreateImage(VkDevice device,
pImage);
}
void
VKAPI_ATTR void VKAPI_CALL
lvp_DestroyImage(VkDevice _device, VkImage _image,
const VkAllocationCallbacks *pAllocator)
{
@ -121,7 +121,7 @@ lvp_DestroyImage(VkDevice _device, VkImage _image,
vk_free2(&device->vk.alloc, pAllocator, image);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
lvp_CreateImageView(VkDevice _device,
const VkImageViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -150,7 +150,7 @@ lvp_CreateImageView(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
lvp_DestroyImageView(VkDevice _device, VkImageView _iview,
const VkAllocationCallbacks *pAllocator)
{
@ -165,7 +165,7 @@ lvp_DestroyImageView(VkDevice _device, VkImageView _iview,
vk_free2(&device->vk.alloc, pAllocator, iview);
}
void lvp_GetImageSubresourceLayout(
VKAPI_ATTR void VKAPI_CALL lvp_GetImageSubresourceLayout(
VkDevice _device,
VkImage _image,
const VkImageSubresource* pSubresource,
@ -227,7 +227,7 @@ void lvp_GetImageSubresourceLayout(
}
}
VkResult lvp_CreateBuffer(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateBuffer(
VkDevice _device,
const VkBufferCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -280,7 +280,7 @@ VkResult lvp_CreateBuffer(
return VK_SUCCESS;
}
void lvp_DestroyBuffer(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyBuffer(
VkDevice _device,
VkBuffer _buffer,
const VkAllocationCallbacks* pAllocator)
@ -296,7 +296,7 @@ void lvp_DestroyBuffer(
vk_free2(&device->vk.alloc, pAllocator, buffer);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
lvp_CreateBufferView(VkDevice _device,
const VkBufferViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -322,7 +322,7 @@ lvp_CreateBufferView(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
lvp_DestroyBufferView(VkDevice _device, VkBufferView bufferView,
const VkAllocationCallbacks *pAllocator)
{

6
src/gallium/frontends/lavapipe/lvp_pass.c
View file

@ -142,7 +142,7 @@ lvp_num_subpass_attachments(const VkSubpassDescription *desc)
(desc->pDepthStencilAttachment != NULL);
}
VkResult lvp_CreateRenderPass(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass(
VkDevice _device,
const VkRenderPassCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -266,7 +266,7 @@ VkResult lvp_CreateRenderPass(
return VK_SUCCESS;
}
void lvp_DestroyRenderPass(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyRenderPass(
VkDevice _device,
VkRenderPass _pass,
const VkAllocationCallbacks* pAllocator)
@ -281,7 +281,7 @@ void lvp_DestroyRenderPass(
vk_free2(&device->vk.alloc, pAllocator, pass);
}
void lvp_GetRenderAreaGranularity(
VKAPI_ATTR void VKAPI_CALL lvp_GetRenderAreaGranularity(
VkDevice device,
VkRenderPass renderPass,
VkExtent2D* pGranularity)

10
src/gallium/frontends/lavapipe/lvp_pipeline.c
View file

@ -40,7 +40,7 @@
dst = temp; \
} while(0)
VkResult lvp_CreateShaderModule(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateShaderModule(
VkDevice _device,
const VkShaderModuleCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -69,7 +69,7 @@ VkResult lvp_CreateShaderModule(
}
void lvp_DestroyShaderModule(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyShaderModule(
VkDevice _device,
VkShaderModule _module,
const VkAllocationCallbacks* pAllocator)
@ -83,7 +83,7 @@ void lvp_DestroyShaderModule(
vk_free2(&device->vk.alloc, pAllocator, module);
}
void lvp_DestroyPipeline(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyPipeline(
VkDevice _device,
VkPipeline _pipeline,
const VkAllocationCallbacks* pAllocator)
@ -860,7 +860,7 @@ lvp_graphics_pipeline_create(
return VK_SUCCESS;
}
VkResult lvp_CreateGraphicsPipelines(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateGraphicsPipelines(
VkDevice _device,
VkPipelineCache pipelineCache,
uint32_t count,
@ -948,7 +948,7 @@ lvp_compute_pipeline_create(
return VK_SUCCESS;
}
VkResult lvp_CreateComputePipelines(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateComputePipelines(
VkDevice _device,
VkPipelineCache pipelineCache,
uint32_t count,

8
src/gallium/frontends/lavapipe/lvp_pipeline_cache.c
View file

@ -23,7 +23,7 @@
#include "lvp_private.h"
VkResult lvp_CreatePipelineCache(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreatePipelineCache(
VkDevice _device,
const VkPipelineCacheCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -54,7 +54,7 @@ VkResult lvp_CreatePipelineCache(
return VK_SUCCESS;
}
void lvp_DestroyPipelineCache(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyPipelineCache(
VkDevice _device,
VkPipelineCache _cache,
const VkAllocationCallbacks* pAllocator)
@ -69,7 +69,7 @@ void lvp_DestroyPipelineCache(
vk_free2(&device->vk.alloc, pAllocator, cache);
}
VkResult lvp_GetPipelineCacheData(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPipelineCacheData(
VkDevice _device,
VkPipelineCache _cache,
size_t* pDataSize,
@ -93,7 +93,7 @@ VkResult lvp_GetPipelineCacheData(
return result;
}
VkResult lvp_MergePipelineCaches(
VKAPI_ATTR VkResult VKAPI_CALL lvp_MergePipelineCaches(
VkDevice _device,
VkPipelineCache destCache,
uint32_t srcCacheCount,

6
src/gallium/frontends/lavapipe/lvp_query.c
View file

@ -24,7 +24,7 @@
#include "lvp_private.h"
#include "pipe/p_context.h"
VkResult lvp_CreateQueryPool(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateQueryPool(
VkDevice _device,
const VkQueryPoolCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -69,7 +69,7 @@ VkResult lvp_CreateQueryPool(
return VK_SUCCESS;
}
void lvp_DestroyQueryPool(
VKAPI_ATTR void VKAPI_CALL lvp_DestroyQueryPool(
VkDevice _device,
VkQueryPool _pool,
const VkAllocationCallbacks* pAllocator)
@ -87,7 +87,7 @@ void lvp_DestroyQueryPool(
vk_free2(&device->vk.alloc, pAllocator, pool);
}
VkResult lvp_GetQueryPoolResults(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetQueryPoolResults(
VkDevice _device,
VkQueryPool queryPool,
uint32_t firstQuery,

36
src/gallium/frontends/lavapipe/lvp_wsi.c
View file

@ -23,7 +23,7 @@
#include "lvp_wsi.h"
static PFN_vkVoidFunction
static PFN_vkVoidFunction VKAPI_CALL
lvp_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{
LVP_FROM_HANDLE(lvp_physical_device, pdevice, physicalDevice);
@ -57,7 +57,7 @@ lvp_finish_wsi(struct lvp_physical_device *physical_device)
&physical_device->vk.instance->alloc);
}
void lvp_DestroySurfaceKHR(
VKAPI_ATTR void VKAPI_CALL lvp_DestroySurfaceKHR(
VkInstance _instance,
VkSurfaceKHR _surface,
const VkAllocationCallbacks* pAllocator)
@ -68,7 +68,7 @@ void lvp_DestroySurfaceKHR(
vk_free2(&instance->vk.alloc, pAllocator, surface);
}
VkResult lvp_GetPhysicalDeviceSurfaceSupportKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceSupportKHR(
VkPhysicalDevice physicalDevice,
uint32_t queueFamilyIndex,
VkSurfaceKHR surface,
@ -82,7 +82,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceSupportKHR(
pSupported);
}
VkResult lvp_GetPhysicalDeviceSurfaceCapabilitiesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceCapabilitiesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
VkSurfaceCapabilitiesKHR* pSurfaceCapabilities)
@ -94,7 +94,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceCapabilitiesKHR(
pSurfaceCapabilities);
}
VkResult lvp_GetPhysicalDeviceSurfaceCapabilities2KHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceCapabilities2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
VkSurfaceCapabilities2KHR* pSurfaceCapabilities)
@ -106,7 +106,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceCapabilities2KHR(
pSurfaceCapabilities);
}
VkResult lvp_GetPhysicalDeviceSurfaceCapabilities2EXT(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceCapabilities2EXT(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
VkSurfaceCapabilities2EXT* pSurfaceCapabilities)
@ -118,7 +118,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceCapabilities2EXT(
pSurfaceCapabilities);
}
VkResult lvp_GetPhysicalDeviceSurfaceFormatsKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceFormatsKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pSurfaceFormatCount,
@ -131,7 +131,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceFormatsKHR(
pSurfaceFormats);
}
VkResult lvp_GetPhysicalDeviceSurfaceFormats2KHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfaceFormats2KHR(
VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
uint32_t* pSurfaceFormatCount,
@ -143,7 +143,7 @@ VkResult lvp_GetPhysicalDeviceSurfaceFormats2KHR(
pSurfaceFormatCount, pSurfaceFormats);
}
VkResult lvp_GetPhysicalDeviceSurfacePresentModesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDeviceSurfacePresentModesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pPresentModeCount,
@ -157,7 +157,7 @@ VkResult lvp_GetPhysicalDeviceSurfacePresentModesKHR(
pPresentModes);
}
VkResult lvp_CreateSwapchainKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSwapchainKHR(
VkDevice _device,
const VkSwapchainCreateInfoKHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
@ -177,7 +177,7 @@ VkResult lvp_CreateSwapchainKHR(
pSwapchain);
}
void lvp_DestroySwapchainKHR(
VKAPI_ATTR void VKAPI_CALL lvp_DestroySwapchainKHR(
VkDevice _device,
VkSwapchainKHR swapchain,
const VkAllocationCallbacks* pAllocator)
@ -193,7 +193,7 @@ void lvp_DestroySwapchainKHR(
wsi_common_destroy_swapchain(_device, swapchain, alloc);
}
VkResult lvp_GetSwapchainImagesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetSwapchainImagesKHR(
VkDevice device,
VkSwapchainKHR swapchain,
uint32_t* pSwapchainImageCount,
@ -204,7 +204,7 @@ VkResult lvp_GetSwapchainImagesKHR(
pSwapchainImages);
}
VkResult lvp_AcquireNextImageKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_AcquireNextImageKHR(
VkDevice device,
VkSwapchainKHR swapchain,
uint64_t timeout,
@ -224,7 +224,7 @@ VkResult lvp_AcquireNextImageKHR(
return lvp_AcquireNextImage2KHR(device, &acquire_info, pImageIndex);
}
VkResult lvp_AcquireNextImage2KHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_AcquireNextImage2KHR(
VkDevice _device,
const VkAcquireNextImageInfoKHR* pAcquireInfo,
uint32_t* pImageIndex)
@ -245,7 +245,7 @@ VkResult lvp_AcquireNextImage2KHR(
return result;
}
VkResult lvp_QueuePresentKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_QueuePresentKHR(
VkQueue _queue,
const VkPresentInfoKHR* pPresentInfo)
{
@ -257,7 +257,7 @@ VkResult lvp_QueuePresentKHR(
}
VkResult lvp_GetDeviceGroupPresentCapabilitiesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetDeviceGroupPresentCapabilitiesKHR(
VkDevice device,
VkDeviceGroupPresentCapabilitiesKHR* pCapabilities)
{
@ -269,7 +269,7 @@ VkResult lvp_GetDeviceGroupPresentCapabilitiesKHR(
return VK_SUCCESS;
}
VkResult lvp_GetDeviceGroupSurfacePresentModesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetDeviceGroupSurfacePresentModesKHR(
VkDevice device,
VkSurfaceKHR surface,
VkDeviceGroupPresentModeFlagsKHR* pModes)
@ -279,7 +279,7 @@ VkResult lvp_GetDeviceGroupSurfacePresentModesKHR(
return VK_SUCCESS;
}
VkResult lvp_GetPhysicalDevicePresentRectanglesKHR(
VKAPI_ATTR VkResult VKAPI_CALL lvp_GetPhysicalDevicePresentRectanglesKHR(
VkPhysicalDevice physicalDevice,
VkSurfaceKHR surface,
uint32_t* pRectCount,

12
src/vulkan/util/vk_cmd_copy.c
View file

@ -33,7 +33,7 @@
#define STACK_ARRAY_FINISH(name) \
if (name != _stack_##name) free(name)
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdCopyBuffer(VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkBuffer dstBuffer,
@ -69,7 +69,7 @@ vk_common_CmdCopyBuffer(VkCommandBuffer commandBuffer,
STACK_ARRAY_FINISH(region2s);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdCopyImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -111,7 +111,7 @@ vk_common_CmdCopyImage(VkCommandBuffer commandBuffer,
STACK_ARRAY_FINISH(region2s);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdCopyBufferToImage(VkCommandBuffer commandBuffer,
VkBuffer srcBuffer,
VkImage dstImage,
@ -152,7 +152,7 @@ vk_common_CmdCopyBufferToImage(VkCommandBuffer commandBuffer,
STACK_ARRAY_FINISH(region2s);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -193,7 +193,7 @@ vk_common_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer,
STACK_ARRAY_FINISH(region2s);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdBlitImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,
@ -242,7 +242,7 @@ vk_common_CmdBlitImage(VkCommandBuffer commandBuffer,
STACK_ARRAY_FINISH(region2s);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_CmdResolveImage(VkCommandBuffer commandBuffer,
VkImage srcImage,
VkImageLayout srcImageLayout,

6
src/vulkan/util/vk_debug_report.c
View file

@ -42,7 +42,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(vk_debug_report_callback, base,
VkDebugReportCallbackEXT,
VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT)
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_CreateDebugReportCallbackEXT(VkInstance _instance,
const VkDebugReportCallbackCreateInfoEXT *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -74,7 +74,7 @@ vk_common_CreateDebugReportCallbackEXT(VkInstance _instance,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_DestroyDebugReportCallbackEXT(VkInstance _instance,
VkDebugReportCallbackEXT _callback,
const VkAllocationCallbacks *pAllocator)
@ -127,7 +127,7 @@ debug_report(struct vk_instance *instance,
mtx_unlock(&instance->debug_report.callbacks_mutex);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_DebugReportMessageEXT(VkInstance _instance,
VkDebugReportFlagsEXT flags,
VkDebugReportObjectTypeEXT objectType,

10
src/vulkan/util/vk_deferred_operation.c
View file

@ -27,7 +27,7 @@
#include "vk_common_entrypoints.h"
#include "vk_device.h"
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_CreateDeferredOperationKHR(VkDevice _device,
const VkAllocationCallbacks *pAllocator,
VkDeferredOperationKHR *pDeferredOperation)
@ -48,7 +48,7 @@ vk_common_CreateDeferredOperationKHR(VkDevice _device,
return VK_SUCCESS;
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_DestroyDeferredOperationKHR(VkDevice _device,
VkDeferredOperationKHR operation,
const VkAllocationCallbacks *pAllocator)
@ -63,21 +63,21 @@ vk_common_DestroyDeferredOperationKHR(VkDevice _device,
vk_free2(&device->alloc, pAllocator, op);
}
uint32_t
VKAPI_ATTR uint32_t VKAPI_CALL
vk_common_GetDeferredOperationMaxConcurrencyKHR(UNUSED VkDevice device,
UNUSED VkDeferredOperationKHR operation)
{
return 1;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_GetDeferredOperationResultKHR(UNUSED VkDevice device,
UNUSED VkDeferredOperationKHR operation)
{
return VK_SUCCESS;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_DeferredOperationJoinKHR(UNUSED VkDevice device,
UNUSED VkDeferredOperationKHR operation)
{

12
src/vulkan/util/vk_device.c
View file

@ -112,7 +112,7 @@ vk_device_get_proc_addr(const struct vk_device *device,
&device->enabled_extensions);
}
PFN_vkVoidFunction
VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vk_common_GetDeviceProcAddr(VkDevice _device,
const char *pName)
{
@ -120,7 +120,7 @@ vk_common_GetDeviceProcAddr(VkDevice _device,
return vk_device_get_proc_addr(device, pName);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetDeviceQueue(VkDevice _device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
@ -139,7 +139,7 @@ vk_common_GetDeviceQueue(VkDevice _device,
device->dispatch_table.GetDeviceQueue2(_device, &info, pQueue);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetBufferMemoryRequirements(VkDevice _device,
VkBuffer buffer,
VkMemoryRequirements *pMemoryRequirements)
@ -158,7 +158,7 @@ vk_common_GetBufferMemoryRequirements(VkDevice _device,
*pMemoryRequirements = reqs.memoryRequirements;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_BindBufferMemory(VkDevice _device,
VkBuffer buffer,
VkDeviceMemory memory,
@ -176,7 +176,7 @@ vk_common_BindBufferMemory(VkDevice _device,
return device->dispatch_table.BindBufferMemory2(_device, 1, &bind);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetImageMemoryRequirements(VkDevice _device,
VkImage image,
VkMemoryRequirements *pMemoryRequirements)
@ -195,7 +195,7 @@ vk_common_GetImageMemoryRequirements(VkDevice _device,
*pMemoryRequirements = reqs.memoryRequirements;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_BindImageMemory(VkDevice _device,
VkImage image,
VkDeviceMemory memory,

4
src/vulkan/util/vk_dispatch_table_gen.py
View file

@ -544,7 +544,7 @@ vk_device_dispatch_table_get_if_supported(
% if e.guard is not None:
#ifdef ${e.guard}
% endif
static ${e.return_type}
static VKAPI_ATTR ${e.return_type} VKAPI_CALL
${e.prefixed_name('vk_tramp')}(${e.decl_params()})
{
<% assert e.params[0].type == 'VkPhysicalDevice' %>
@ -578,7 +578,7 @@ struct vk_physical_device_dispatch_table vk_physical_device_trampolines = {
% if e.guard is not None:
#ifdef ${e.guard}
% endif
static ${e.return_type}
static VKAPI_ATTR ${e.return_type} VKAPI_CALL
${e.prefixed_name('vk_tramp')}(${e.decl_params()})
{
% if e.params[0].type == 'VkDevice':

8
src/vulkan/util/vk_entrypoints_gen.py
View file

@ -60,7 +60,7 @@ extern const struct vk_device_entrypoint_table ${p}_device_entrypoints;
#ifdef ${e.guard}
% endif
% for p in physical_device_prefixes:
${e.return_type} ${p}_${e.name}(${e.decl_params()});
VKAPI_ATTR ${e.return_type} VKAPI_CALL ${p}_${e.name}(${e.decl_params()});
% endfor
% if e.guard is not None:
#endif // ${e.guard}
@ -72,7 +72,7 @@ extern const struct vk_device_entrypoint_table ${p}_device_entrypoints;
#ifdef ${e.guard}
% endif
% for p in physical_device_prefixes:
${e.return_type} ${p}_${e.name}(${e.decl_params()});
VKAPI_ATTR ${e.return_type} VKAPI_CALL ${p}_${e.name}(${e.decl_params()});
% endfor
% if e.guard is not None:
#endif // ${e.guard}
@ -84,7 +84,7 @@ extern const struct vk_device_entrypoint_table ${p}_device_entrypoints;
#ifdef ${e.guard}
% endif
% for p in device_prefixes:
${e.return_type} ${p}_${e.name}(${e.decl_params()});
VKAPI_ATTR ${e.return_type} VKAPI_CALL ${p}_${e.name}(${e.decl_params()});
% endfor
% if e.guard is not None:
#endif // ${e.guard}
@ -122,7 +122,7 @@ TEMPLATE_C = Template(COPYRIGHT + """
${e.return_type} (*${p}_${e.name}_Null)(${e.decl_params()}) = 0;
${e.return_type} ${p}_${e.name}_Weak(${e.decl_params()});
#else
${e.return_type} ${p}_${e.name}(${e.decl_params()}) __attribute__ ((weak));
VKAPI_ATTR ${e.return_type} VKAPI_CALL ${p}_${e.name}(${e.decl_params()}) __attribute__ ((weak));
#endif
% endfor
% if e.guard is not None:

2
src/vulkan/util/vk_extensions_gen.py
View file

@ -160,7 +160,7 @@ extern const struct vk_device_extension_table vk_android_allowed_device_extensio
static const uint32_t MAX_API_VERSION = ${MAX_API_VERSION.c_vk_version()};
VkResult ${driver}_EnumerateInstanceVersion(
VKAPI_ATTR VkResult VKAPI_CALL ${driver}_EnumerateInstanceVersion(
uint32_t* pApiVersion)
{
*pApiVersion = MAX_API_VERSION;

8
src/vulkan/util/vk_object.c
View file

@ -232,7 +232,7 @@ vk_object_base_get_private_data(struct vk_device *device,
}
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_CreatePrivateDataSlotEXT(VkDevice _device,
const VkPrivateDataSlotCreateInfoEXT *pCreateInfo,
const VkAllocationCallbacks *pAllocator,
@ -243,7 +243,7 @@ vk_common_CreatePrivateDataSlotEXT(VkDevice _device,
pPrivateDataSlot);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_DestroyPrivateDataSlotEXT(VkDevice _device,
VkPrivateDataSlotEXT privateDataSlot,
const VkAllocationCallbacks *pAllocator)
@ -252,7 +252,7 @@ vk_common_DestroyPrivateDataSlotEXT(VkDevice _device,
vk_private_data_slot_destroy(device, privateDataSlot, pAllocator);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_SetPrivateDataEXT(VkDevice _device,
VkObjectType objectType,
uint64_t objectHandle,
@ -265,7 +265,7 @@ vk_common_SetPrivateDataEXT(VkDevice _device,
privateDataSlot, data);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetPrivateDataEXT(VkDevice _device,
VkObjectType objectType,
uint64_t objectHandle,

14
src/vulkan/util/vk_physical_device.c
View file

@ -54,7 +54,7 @@ vk_physical_device_finish(struct vk_physical_device *physical_device)
vk_object_base_finish(&physical_device->base);
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice,
uint32_t *pPropertyCount,
VkLayerProperties *pProperties)
@ -68,7 +68,7 @@ vk_common_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice,
return VK_ERROR_LAYER_NOT_PRESENT;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
const char *pLayerName,
uint32_t *pPropertyCount,
@ -94,7 +94,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
return vk_outarray_status(&out);
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures *pFeatures)
{
@ -110,7 +110,7 @@ vk_common_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice,
*pFeatures = features2.features;
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties *pProperties)
{
@ -126,7 +126,7 @@ vk_common_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
*pProperties = props2.properties;
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties *pMemoryProperties)
{
@ -142,7 +142,7 @@ vk_common_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice,
*pMemoryProperties = props2.memoryProperties;
}
void
VKAPI_ATTR void VKAPI_CALL
vk_common_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties *pFormatProperties)
@ -159,7 +159,7 @@ vk_common_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
*pFormatProperties = props2.formatProperties;
}
VkResult
VKAPI_ATTR VkResult VKAPI_CALL
vk_common_GetPhysicalDeviceImageFormatProperties(VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,