layers: Update function signatures for RT
Update all ValidationObject override signatures to match spec so they
aren't treated as overloads instead.
Change-Id: I02efeb5f2e830e9514020182b7332d27fa826a1d
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 2770bc4..514c106 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -13547,7 +13547,7 @@
return false;
}
-bool CoreChecks::PreCallValidateCopyAccelerationStructureKHR(VkDevice device,
+bool CoreChecks::PreCallValidateCopyAccelerationStructureKHR(VkDevice device, VkDeferredOperationKHR deferredOperation,
const VkCopyAccelerationStructureInfoKHR *pInfo) const {
bool skip = false;
skip |= ValidateCopyAccelerationStructureInfoKHR(pInfo, "vkCopyAccelerationStructureKHR");
diff --git a/layers/core_validation.h b/layers/core_validation.h
index d1ba04d..8e19ded 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -894,8 +894,8 @@
const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable,
- const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkBuffer buffer,
- VkDeviceSize offset);
+ const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable,
+ VkDeviceAddress indirectDeviceAddress);
bool PreCallValidateCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) const;
void PostCallRecordCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo,
@@ -1353,7 +1353,7 @@
bool ValidateCopyAccelerationStructureInfoKHR(const VkCopyAccelerationStructureInfoKHR* pInfo, const char* api_name) const;
bool PreCallValidateCmdCopyAccelerationStructureKHR(VkCommandBuffer commandBuffer,
const VkCopyAccelerationStructureInfoKHR* pInfo) const;
- bool PreCallValidateCopyAccelerationStructureKHR(VkDevice device, const VkCopyAccelerationStructureInfoKHR* pInfo) const;
+ bool PreCallValidateCopyAccelerationStructureKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureInfoKHR* pInfo) const;
bool PreCallValidateCmdCopyAccelerationStructureToMemoryKHR(VkCommandBuffer commandBuffer,
const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) const;
bool PreCallValidateCmdCopyMemoryToAccelerationStructureKHR(VkCommandBuffer commandBuffer,
diff --git a/layers/debug_printf.cpp b/layers/debug_printf.cpp
index 736b628..f12a3aa 100644
--- a/layers/debug_printf.cpp
+++ b/layers/debug_printf.cpp
@@ -757,7 +757,7 @@
const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable,
- VkBuffer buffer, VkDeviceSize offset) {
+ VkDeviceAddress indirectDeviceAddress) {
AllocateDebugPrintfResources(commandBuffer, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR);
}
@@ -766,7 +766,7 @@
const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable,
- VkBuffer buffer, VkDeviceSize offset) {
+ VkDeviceAddress indirectDeviceAddress) {
CMD_BUFFER_STATE *cb_state = GetCBState(commandBuffer);
cb_state->hasTraceRaysCmd = true;
}
diff --git a/layers/debug_printf.h b/layers/debug_printf.h
index bb0a949..41ff3c4 100644
--- a/layers/debug_printf.h
+++ b/layers/debug_printf.h
@@ -221,14 +221,14 @@
const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable,
- const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkBuffer buffer,
- VkDeviceSize offset);
+ const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable,
+ VkDeviceAddress indirectDeviceAddress);
void PostCallRecordCmdTraceRaysIndirectKHR(VkCommandBuffer commandBuffer,
const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable,
- const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkBuffer buffer,
- VkDeviceSize offset);
+ const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable,
+ VkDeviceAddress indirectDeviceAddress);
void PostCallRecordQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence,
VkResult result);
void AllocateDebugPrintfResources(const VkCommandBuffer cmd_buffer, const VkPipelineBindPoint bind_point);
diff --git a/layers/drawdispatch.cpp b/layers/drawdispatch.cpp
index cb9b4dc..25bcd8e 100644
--- a/layers/drawdispatch.cpp
+++ b/layers/drawdispatch.cpp
@@ -1047,13 +1047,11 @@
const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable,
- VkBuffer buffer, VkDeviceSize offset) {
+ VkDeviceAddress indirectDeviceAddress) {
CMD_BUFFER_STATE *cb_state = GetCBState(commandBuffer);
- BUFFER_STATE *buffer_state = GetBufferState(buffer);
UpdateStateCmdDrawDispatchType(cb_state, CMD_TRACERAYSINDIRECTKHR, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
"vkCmdTraceRaysIndirectKHR()");
cb_state->hasTraceRaysCmd = true;
- AddCommandBufferBindingBuffer(cb_state, buffer_state);
}
bool CoreChecks::PreCallValidateCmdDrawMeshTasksNV(VkCommandBuffer commandBuffer, uint32_t taskCount, uint32_t firstTask) const {
diff --git a/layers/gpu_validation.cpp b/layers/gpu_validation.cpp
index f273337..d0e334d 100644
--- a/layers/gpu_validation.cpp
+++ b/layers/gpu_validation.cpp
@@ -1525,7 +1525,7 @@
const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable,
- VkBuffer buffer, VkDeviceSize offset) {
+ VkDeviceAddress indirectDeviceAddress) {
AllocateValidationResources(commandBuffer, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR);
}
@@ -1534,7 +1534,7 @@
const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pHitShaderBindingTable,
const VkStridedDeviceAddressRegionKHR *pCallableShaderBindingTable,
- VkBuffer buffer, VkDeviceSize offset) {
+ VkDeviceAddress indirectDeviceAddress) {
CMD_BUFFER_STATE *cb_state = GetCBState(commandBuffer);
cb_state->hasTraceRaysCmd = true;
}
diff --git a/layers/gpu_validation.h b/layers/gpu_validation.h
index a858331..ce76e26 100644
--- a/layers/gpu_validation.h
+++ b/layers/gpu_validation.h
@@ -265,14 +265,14 @@
const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable,
- const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkBuffer buffer,
- VkDeviceSize offset);
+ const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable,
+ VkDeviceAddress indirectDeviceAddress);
void PostCallRecordCmdTraceRaysIndirectKHR(VkCommandBuffer commandBuffer,
const VkStridedDeviceAddressRegionKHR* pRaygenShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pMissShaderBindingTable,
const VkStridedDeviceAddressRegionKHR* pHitShaderBindingTable,
- const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable, VkBuffer buffer,
- VkDeviceSize offset);
+ const VkStridedDeviceAddressRegionKHR* pCallableShaderBindingTable,
+ VkDeviceAddress indirectDeviceAddress);
void AllocateValidationResources(const VkCommandBuffer cmd_buffer, const VkPipelineBindPoint bind_point);
void PostCallRecordGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties* pPhysicalDeviceProperties);
