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

anv: Enable Vulkan 1.2 support

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Iván Briano 2019-09-16 15:41:45 -07:00 • committed by Jason Ekstrand
parent c616627f63
commit 4ef3f7e3d3
7 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/intel/vulkan/anv_device.c
View file

@ -1614,8 +1614,8 @@ anv_get_physical_device_properties_1_2(struct anv_physical_device *pdevice,
"Mesa " PACKAGE_VERSION MESA_GIT_SHA1); "Mesa " PACKAGE_VERSION MESA_GIT_SHA1);
p->conformanceVersion = (VkConformanceVersionKHR) { p->conformanceVersion = (VkConformanceVersionKHR) {
.major = 1, .major = 1,
.minor = 1, .minor = 2,
.subminor = 2, .subminor = 0,
.patch = 0, .patch = 0,
}; };
@ -4189,7 +4189,7 @@ void anv_DestroyBuffer(
vk_free2(&device->alloc, pAllocator, buffer); vk_free2(&device->alloc, pAllocator, buffer);
} }
VkDeviceAddress anv_GetBufferDeviceAddressKHR( VkDeviceAddress anv_GetBufferDeviceAddress(
VkDevice device, VkDevice device,
const VkBufferDeviceAddressInfoKHR* pInfo) const VkBufferDeviceAddressInfoKHR* pInfo)
{ {
@ -4201,14 +4201,14 @@ VkDeviceAddress anv_GetBufferDeviceAddressKHR(
return anv_address_physical(buffer->address); return anv_address_physical(buffer->address);
} }
uint64_t anv_GetBufferOpaqueCaptureAddressKHR( uint64_t anv_GetBufferOpaqueCaptureAddress(
VkDevice device, VkDevice device,
const VkBufferDeviceAddressInfoKHR* pInfo) const VkBufferDeviceAddressInfoKHR* pInfo)
{ {
return 0; return 0;
} }
uint64_t anv_GetDeviceMemoryOpaqueCaptureAddressKHR( uint64_t anv_GetDeviceMemoryOpaqueCaptureAddress(
VkDevice device, VkDevice device,
const VkDeviceMemoryOpaqueCaptureAddressInfoKHR* pInfo) const VkDeviceMemoryOpaqueCaptureAddressInfoKHR* pInfo)
{ {

1
src/intel/vulkan/anv_extensions.py
View file

@ -54,6 +54,7 @@ API_PATCH_VERSION = 131
API_VERSIONS = [ API_VERSIONS = [
ApiVersion('1.0', True), ApiVersion('1.0', True),
ApiVersion('1.1', True), ApiVersion('1.1', True),
ApiVersion('1.2', True),
] ]
MAX_API_VERSION = None # Computed later MAX_API_VERSION = None # Computed later

4
src/intel/vulkan/anv_pass.c
View file

@ -339,7 +339,7 @@ VkResult anv_CreateRenderPass(
for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) { for (uint32_t i = 0; i < pCreateInfo->dependencyCount; i++) {
/* Convert to a Dependency2KHR */ /* Convert to a Dependency2KHR */
VkSubpassDependency2KHR dep2 = { VkSubpassDependency2 dep2 = {
.srcSubpass = pCreateInfo->pDependencies[i].srcSubpass, .srcSubpass = pCreateInfo->pDependencies[i].srcSubpass,
.dstSubpass = pCreateInfo->pDependencies[i].dstSubpass, .dstSubpass = pCreateInfo->pDependencies[i].dstSubpass,
.srcStageMask = pCreateInfo->pDependencies[i].srcStageMask, .srcStageMask = pCreateInfo->pDependencies[i].srcStageMask,
@ -392,7 +392,7 @@ num_subpass_attachments2(const VkSubpassDescription2KHR *desc)
(ds_resolve && ds_resolve->pDepthStencilResolveAttachment); (ds_resolve && ds_resolve->pDepthStencilResolveAttachment);
} }
VkResult anv_CreateRenderPass2KHR( VkResult anv_CreateRenderPass2(
VkDevice _device, VkDevice _device,
const VkRenderPassCreateInfo2KHR* pCreateInfo, const VkRenderPassCreateInfo2KHR* pCreateInfo,
const VkAllocationCallbacks* pAllocator, const VkAllocationCallbacks* pAllocator,

6
src/intel/vulkan/anv_queue.c
View file

@ -2145,7 +2145,7 @@ VkResult anv_GetSemaphoreFdKHR(
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult anv_GetSemaphoreCounterValueKHR( VkResult anv_GetSemaphoreCounterValue(
VkDevice _device, VkDevice _device,
VkSemaphore _semaphore, VkSemaphore _semaphore,
uint64_t* pValue) uint64_t* pValue)
@ -2277,7 +2277,7 @@ anv_timelines_wait(struct anv_device *device,
} }
} }
VkResult anv_WaitSemaphoresKHR( VkResult anv_WaitSemaphores(
VkDevice _device, VkDevice _device,
const VkSemaphoreWaitInfoKHR* pWaitInfo, const VkSemaphoreWaitInfoKHR* pWaitInfo,
uint64_t timeout) uint64_t timeout)
@ -2329,7 +2329,7 @@ VkResult anv_WaitSemaphoresKHR(
return result; return result;
} }
VkResult anv_SignalSemaphoreKHR( VkResult anv_SignalSemaphore(
VkDevice _device, VkDevice _device,
const VkSemaphoreSignalInfoKHR* pSignalInfo) const VkSemaphoreSignalInfoKHR* pSignalInfo)
{ {

10
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -3494,7 +3494,7 @@ emit_draw_count_predicate_with_conditional_render(
} }
#endif #endif
void genX(CmdDrawIndirectCountKHR)( void genX(CmdDrawIndirectCount)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkBuffer _buffer, VkBuffer _buffer,
VkDeviceSize offset, VkDeviceSize offset,
@ -3560,7 +3560,7 @@ void genX(CmdDrawIndirectCountKHR)(
} }
} }
void genX(CmdDrawIndexedIndirectCountKHR)( void genX(CmdDrawIndexedIndirectCount)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
VkBuffer _buffer, VkBuffer _buffer,
VkDeviceSize offset, VkDeviceSize offset,
@ -5249,7 +5249,7 @@ void genX(CmdBeginRenderPass)(
cmd_buffer_begin_subpass(cmd_buffer, 0); cmd_buffer_begin_subpass(cmd_buffer, 0);
} }
void genX(CmdBeginRenderPass2KHR)( void genX(CmdBeginRenderPass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkRenderPassBeginInfo* pRenderPassBeginInfo, const VkRenderPassBeginInfo* pRenderPassBeginInfo,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo) const VkSubpassBeginInfoKHR* pSubpassBeginInfo)
@ -5274,7 +5274,7 @@ void genX(CmdNextSubpass)(
cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1); cmd_buffer_begin_subpass(cmd_buffer, prev_subpass + 1);
} }
void genX(CmdNextSubpass2KHR)( void genX(CmdNextSubpass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkSubpassBeginInfoKHR* pSubpassBeginInfo, const VkSubpassBeginInfoKHR* pSubpassBeginInfo,
const VkSubpassEndInfoKHR* pSubpassEndInfo) const VkSubpassEndInfoKHR* pSubpassEndInfo)
@ -5306,7 +5306,7 @@ void genX(CmdEndRenderPass)(
cmd_buffer->state.subpass = NULL; cmd_buffer->state.subpass = NULL;
} }
void genX(CmdEndRenderPass2KHR)( void genX(CmdEndRenderPass2)(
VkCommandBuffer commandBuffer, VkCommandBuffer commandBuffer,
const VkSubpassEndInfoKHR* pSubpassEndInfo) const VkSubpassEndInfoKHR* pSubpassEndInfo)
{ {

2
src/intel/vulkan/genX_query.c
View file

@ -544,7 +544,7 @@ void genX(CmdResetQueryPool)(
} }
} }
void genX(ResetQueryPoolEXT)( void genX(ResetQueryPool)(
VkDevice _device, VkDevice _device,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t firstQuery, uint32_t firstQuery,

6
src/intel/vulkan/genX_state.c
View file

@ -446,9 +446,9 @@ VkResult genX(CreateSampler)(
break; break;
} }
#if GEN_GEN >= 9 #if GEN_GEN >= 9
case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT: { case VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO: {
VkSamplerReductionModeCreateInfoEXT *sampler_reduction = VkSamplerReductionModeCreateInfo *sampler_reduction =
(VkSamplerReductionModeCreateInfoEXT *) ext; (VkSamplerReductionModeCreateInfo *) ext;
sampler_reduction_mode = sampler_reduction_mode =
vk_to_gen_sampler_reduction_mode[sampler_reduction->reductionMode]; vk_to_gen_sampler_reduction_mode[sampler_reduction->reductionMode];
enable_sampler_reduction = true; enable_sampler_reduction = true;