Commit 4ef3f7e3 authored by Ivan Briano's avatar Ivan Briano Committed by Jason Ekstrand

anv: Enable Vulkan 1.2 support

Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>
parent c616627f
......@@ -1614,8 +1614,8 @@ anv_get_physical_device_properties_1_2(struct anv_physical_device *pdevice,
"Mesa " PACKAGE_VERSION MESA_GIT_SHA1);
p->conformanceVersion = (VkConformanceVersionKHR) {
.major = 1,
.minor = 1,
.subminor = 2,
.minor = 2,
.subminor = 0,
.patch = 0,
};
......@@ -4189,7 +4189,7 @@ void anv_DestroyBuffer(
vk_free2(&device->alloc, pAllocator, buffer);
}
VkDeviceAddress anv_GetBufferDeviceAddressKHR(
VkDeviceAddress anv_GetBufferDeviceAddress(
VkDevice device,
const VkBufferDeviceAddressInfoKHR* pInfo)
{
......@@ -4201,14 +4201,14 @@ VkDeviceAddress anv_GetBufferDeviceAddressKHR(
return anv_address_physical(buffer->address);
}
uint64_t anv_GetBufferOpaqueCaptureAddressKHR(
uint64_t anv_GetBufferOpaqueCaptureAddress(
VkDevice device,
const VkBufferDeviceAddressInfoKHR* pInfo)
{
return 0;
}
uint64_t anv_GetDeviceMemoryOpaqueCaptureAddressKHR(
uint64_t anv_GetDeviceMemoryOpaqueCaptureAddress(
VkDevice device,
const VkDeviceMemoryOpaqueCaptureAddressInfoKHR* pInfo)
{
......
......@@ -54,6 +54,7 @@ API_PATCH_VERSION = 131
API_VERSIONS = [
ApiVersion('1.0', True),
ApiVersion('1.1', True),
ApiVersion('1.2', True),
]
MAX_API_VERSION = None # Computed later
......
......@@ -339,7 +339,7 @@ VkResult anv_CreateRenderPass(
for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) {
/* Convert to a Dependency2KHR */
VkSubpassDependency2KHR dep2 = {
VkSubpassDependency2 dep2 = {
.srcSubpass = pCreateInfo->pDependencies[i].srcSubpass,
.dstSubpass = pCreateInfo->pDependencies[i].dstSubpass,
.srcStageMask = pCreateInfo->pDependencies[i].srcStageMask,
......@@ -392,7 +392,7 @@ num_subpass_attachments2(const VkSubpassDescription2KHR *desc)
(ds_resolve && ds_resolve->pDepthStencilResolveAttachment);
}
VkResult anv_CreateRenderPass2KHR(
VkResult anv_CreateRenderPass2(
VkDevice _device,
const VkRenderPassCreateInfo2KHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator,
......
......@@ -2145,7 +2145,7 @@ VkResult anv_GetSemaphoreFdKHR(
return VK_SUCCESS;
}
VkResult anv_GetSemaphoreCounterValueKHR(
VkResult anv_GetSemaphoreCounterValue(
VkDevice _device,
VkSemaphore _semaphore,
uint64_t* pValue)
......@@ -2277,7 +2277,7 @@ anv_timelines_wait(struct anv_device *device,
}
}
VkResult anv_WaitSemaphoresKHR(
VkResult anv_WaitSemaphores(
VkDevice _device,
const VkSemaphoreWaitInfoKHR* pWaitInfo,
uint64_t timeout)
......@@ -2329,7 +2329,7 @@ VkResult anv_WaitSemaphoresKHR(
return result;
}
VkResult anv_SignalSemaphoreKHR(
VkResult anv_SignalSemaphore(
VkDevice _device,
const VkSemaphoreSignalInfoKHR* pSignalInfo)
{
......
......@@ -3494,7 +3494,7 @@ emit_draw_count_predicate_with_conditional_render(
}
#endif
void genX(CmdDrawIndirectCountKHR)(
void genX(CmdDrawIndirectCount)(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
......@@ -3560,7 +3560,7 @@ void genX(CmdDrawIndirectCountKHR)(
}
}
void genX(CmdDrawIndexedIndirectCountKHR)(
void genX(CmdDrawIndexedIndirectCount)(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
......@@ -5249,7 +5249,7 @@ void genX(CmdBeginRenderPass)(
cmd_buffer_begin_subpass(cmd_buffer, 0);
}
void genX(CmdBeginRenderPass2KHR)(
void genX(CmdBeginRenderPass2)(
VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBeginInfo,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo)
......@@ -5274,7 +5274,7 @@ void genX(CmdNextSubpass)(
cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1);
}
void genX(CmdNextSubpass2KHR)(
void genX(CmdNextSubpass2)(
VkCommandBuffer commandBuffer,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo,
const VkSubpassEndInfoKHR* pSubpassEndInfo)
......@@ -5306,7 +5306,7 @@ void genX(CmdEndRenderPass)(
cmd_buffer->state.subpass = NULL;
}
void genX(CmdEndRenderPass2KHR)(
void genX(CmdEndRenderPass2)(
VkCommandBuffer commandBuffer,
const VkSubpassEndInfoKHR* pSubpassEndInfo)
{
......
......@@ -544,7 +544,7 @@ void genX(CmdResetQueryPool)(
}
}
void genX(ResetQueryPoolEXT)(
void genX(ResetQueryPool)(
VkDevice _device,
VkQueryPool queryPool,
uint32_t firstQuery,
......
......@@ -446,9 +446,9 @@ VkResult genX(CreateSampler)(
break;
}
#if GEN_GEN >= 9
case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT: {
VkSamplerReductionModeCreateInfoEXT *sampler_reduction =
(VkSamplerReductionModeCreateInfoEXT *) ext;
case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO: {
VkSamplerReductionModeCreateInfo *sampler_reduction =
(VkSamplerReductionModeCreateInfo *) ext;
sampler_reduction_mode =
vk_to_gen_sampler_reduction_mode[sampler_reduction->reductionMode];
enable_sampler_reduction = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment