Skip to content

Commit d16973b

Browse files
bradgrantham-lunargbradgrantham-lunarg
committed
fix namespaces on some vulkan wrappers
1 parent 80d02d3 commit d16973b

5 files changed

+29
-28
lines changed

‎framework/encode/vulkan_handle_wrappers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct HandleWrapper
7272

7373
// clang-format off
7474
struct ShaderModuleWrapper : public HandleWrapper<VkShaderModule> {};
75-
struct PipelineCacheWrapper : public HandleWrapper<VkPipelineCache> {};
75+
// struct PipelineCacheWrapper : public HandleWrapper<VkPipelineCache> {};
7676
struct SamplerWrapper : public HandleWrapper<VkSampler> {};
7777
struct SamplerYcbcrConversionWrapper : public HandleWrapper<VkSamplerYcbcrConversion> {};
7878
struct DebugReportCallbackEXTWrapper : public HandleWrapper<VkDebugReportCallbackEXT> {};

‎framework/encode/vulkan_state_tracker_initializers.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ inline void InitializeState<VkDevice, vulkan_wrappers::EventWrapper, VkEventCrea
235235

236236
template <>
237237
inline void
238-
InitializeState<VkDevice, vulka_wrappers::PipelineCacheWrapper, VkPipelineCacheCreateInfo>(VkDevice parent_handle,
239-
vulka_wrappers::PipelineCacheWrapper* wrapper,
238+
InitializeState<VkDevice, vulkan_wrappers::PipelineCacheWrapper, VkPipelineCacheCreateInfo>(VkDevice parent_handle,
239+
vulkan_wrappers::PipelineCacheWrapper* wrapper,
240240
const VkPipelineCacheCreateInfo* create_info,
241241
format::ApiCallId create_call_id,
242-
CreateParameters create_parameters)
242+
vulkan_state_info::CreateParameters create_parameters)
243243
{
244244
assert(wrapper != nullptr);
245245
assert(create_info != nullptr);
@@ -248,7 +248,7 @@ InitializeState<VkDevice, vulka_wrappers::PipelineCacheWrapper, VkPipelineCacheC
248248
wrapper->create_call_id = create_call_id;
249249
wrapper->create_parameters = std::move(create_parameters);
250250

251-
wrapper->device = GetWrapper<vulka_wrappers::DeviceWrapper>(parent_handle);
251+
wrapper->device = GetVulkanWrapper<vulkan_wrappers::DeviceWrapper>(parent_handle);
252252

253253
wrapper->create_info = *create_info;
254254
}

‎framework/encode/vulkan_state_writer.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void VulkanStateWriter::WritePipelineLayoutState(const VulkanStateTable& state_t
549549

550550
void VulkanStateWriter::WritePipelineCacheState(const VulkanStateTable& state_table)
551551
{
552-
state_table.VisitWrappers([&](const PipelineCacheWrapper* wrapper) {
552+
state_table.VisitWrappers([&](const vulkan_wrappers::PipelineCacheWrapper* wrapper) {
553553
GFXRECON_ASSERT(wrapper != nullptr);
554554

555555
// Pipeline cache data can be indirectly changed by pipeline creation command or directly changed by calls like
@@ -562,23 +562,24 @@ void VulkanStateWriter::WritePipelineCacheState(const VulkanStateTable& state_ta
562562

563563
if (data_size != 0)
564564
{
565-
const_cast<PipelineCacheWrapper*>(wrapper)->cache_data.resize(data_size);
565+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->cache_data.resize(data_size);
566566

567567
result = wrapper->device->layer_table.GetPipelineCacheData(
568568
wrapper->device->handle,
569569
wrapper->handle,
570570
&data_size,
571-
const_cast<PipelineCacheWrapper*>(wrapper)->cache_data.data());
571+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->cache_data.data());
572572

573573
GFXRECON_ASSERT(result == VK_SUCCESS);
574574

575-
const_cast<PipelineCacheWrapper*>(wrapper)->create_info.initialDataSize = data_size;
576-
const_cast<PipelineCacheWrapper*>(wrapper)->create_info.pInitialData = wrapper->cache_data.data();
575+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->create_info.initialDataSize = data_size;
576+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->create_info.pInitialData =
577+
wrapper->cache_data.data();
577578
}
578579
else
579580
{
580-
const_cast<PipelineCacheWrapper*>(wrapper)->create_info.initialDataSize = 0;
581-
const_cast<PipelineCacheWrapper*>(wrapper)->create_info.pInitialData = nullptr;
581+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->create_info.initialDataSize = 0;
582+
const_cast<vulkan_wrappers::PipelineCacheWrapper*>(wrapper)->create_info.pInitialData = nullptr;
582583
}
583584

584585
WriteCreatePipelineCache(wrapper->device->handle_id,
@@ -2581,7 +2582,7 @@ void VulkanStateWriter::WriteCreatePipelineCache(format::HandleId
25812582
{
25822583
omit_output_data = true;
25832584
}
2584-
encoder_.EncodeHandlePtr<PipelineCacheWrapper>(pPipelineCache, omit_output_data);
2585+
encoder_.EncodeHandlePtr<vulkan_wrappers::PipelineCacheWrapper>(pPipelineCache, omit_output_data);
25852586
encoder_.EncodeEnumValue(result);
25862587
WriteFunctionCall(call_id, &parameter_stream_);
25872588
parameter_stream_.Reset();

‎framework/generated/generated_vulkan_api_call_encoders.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -23879,13 +23879,13 @@ VKAPI_ATTR VkResult VKAPI_CALL SetLatencySleepModeNV(
2387923879

2388023880
CustomEncoderPreCall<format::ApiCallId::ApiCall_vkSetLatencySleepModeNV>::Dispatch(manager, device, swapchain, pSleepModeInfo);
2388123881

23882-
VkResult result = GetDeviceTable(device)->SetLatencySleepModeNV(device, swapchain, pSleepModeInfo);
23882+
VkResult result = GetVulkanDeviceTable(device)->SetLatencySleepModeNV(device, swapchain, pSleepModeInfo);
2388323883

2388423884
auto encoder = manager->BeginApiCallCapture(format::ApiCallId::ApiCall_vkSetLatencySleepModeNV);
2388523885
if (encoder)
2388623886
{
23887-
encoder->EncodeHandleValue<DeviceWrapper>(device);
23888-
encoder->EncodeHandleValue<SwapchainKHRWrapper>(swapchain);
23887+
encoder->EncodeHandleValue<vulkan_wrappers::DeviceWrapper>(device);
23888+
encoder->EncodeHandleValue<vulkan_wrappers::SwapchainKHRWrapper>(swapchain);
2388923889
EncodeStructPtr(encoder, pSleepModeInfo);
2389023890
encoder->EncodeEnumValue(result);
2389123891
manager->EndApiCallCapture();
@@ -23920,13 +23920,13 @@ VKAPI_ATTR VkResult VKAPI_CALL LatencySleepNV(
2392023920
auto handle_unwrap_memory = manager->GetHandleUnwrapMemory();
2392123921
const VkLatencySleepInfoNV* pSleepInfo_unwrapped = UnwrapStructPtrHandles(pSleepInfo, handle_unwrap_memory);
2392223922

23923-
VkResult result = GetDeviceTable(device)->LatencySleepNV(device, swapchain, pSleepInfo_unwrapped);
23923+
VkResult result = GetVulkanDeviceTable(device)->LatencySleepNV(device, swapchain, pSleepInfo_unwrapped);
2392423924

2392523925
auto encoder = manager->BeginApiCallCapture(format::ApiCallId::ApiCall_vkLatencySleepNV);
2392623926
if (encoder)
2392723927
{
23928-
encoder->EncodeHandleValue<DeviceWrapper>(device);
23929-
encoder->EncodeHandleValue<SwapchainKHRWrapper>(swapchain);
23928+
encoder->EncodeHandleValue<vulkan_wrappers::DeviceWrapper>(device);
23929+
encoder->EncodeHandleValue<vulkan_wrappers::SwapchainKHRWrapper>(swapchain);
2393023930
EncodeStructPtr(encoder, pSleepInfo);
2393123931
encoder->EncodeEnumValue(result);
2393223932
manager->EndApiCallCapture();
@@ -23961,13 +23961,13 @@ VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV(
2396123961
auto encoder = manager->BeginApiCallCapture(format::ApiCallId::ApiCall_vkSetLatencyMarkerNV);
2396223962
if (encoder)
2396323963
{
23964-
encoder->EncodeHandleValue<DeviceWrapper>(device);
23965-
encoder->EncodeHandleValue<SwapchainKHRWrapper>(swapchain);
23964+
encoder->EncodeHandleValue<vulkan_wrappers::DeviceWrapper>(device);
23965+
encoder->EncodeHandleValue<vulkan_wrappers::SwapchainKHRWrapper>(swapchain);
2396623966
EncodeStructPtr(encoder, pLatencyMarkerInfo);
2396723967
manager->EndApiCallCapture();
2396823968
}
2396923969

23970-
GetDeviceTable(device)->SetLatencyMarkerNV(device, swapchain, pLatencyMarkerInfo);
23970+
GetVulkanDeviceTable(device)->SetLatencyMarkerNV(device, swapchain, pLatencyMarkerInfo);
2397123971

2397223972
CustomEncoderPostCall<format::ApiCallId::ApiCall_vkSetLatencyMarkerNV>::Dispatch(manager, device, swapchain, pLatencyMarkerInfo);
2397323973
}
@@ -23993,13 +23993,13 @@ VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV(
2399323993

2399423994
CustomEncoderPreCall<format::ApiCallId::ApiCall_vkGetLatencyTimingsNV>::Dispatch(manager, device, swapchain, pLatencyMarkerInfo);
2399523995

23996-
GetDeviceTable(device)->GetLatencyTimingsNV(device, swapchain, pLatencyMarkerInfo);
23996+
GetVulkanDeviceTable(device)->GetLatencyTimingsNV(device, swapchain, pLatencyMarkerInfo);
2399723997

2399823998
auto encoder = manager->BeginApiCallCapture(format::ApiCallId::ApiCall_vkGetLatencyTimingsNV);
2399923999
if (encoder)
2400024000
{
24001-
encoder->EncodeHandleValue<DeviceWrapper>(device);
24002-
encoder->EncodeHandleValue<SwapchainKHRWrapper>(swapchain);
24001+
encoder->EncodeHandleValue<vulkan_wrappers::DeviceWrapper>(device);
24002+
encoder->EncodeHandleValue<vulkan_wrappers::SwapchainKHRWrapper>(swapchain);
2400324003
EncodeStructPtr(encoder, pLatencyMarkerInfo);
2400424004
manager->EndApiCallCapture();
2400524005
}
@@ -24030,12 +24030,12 @@ VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV(
2403024030
auto encoder = manager->BeginApiCallCapture(format::ApiCallId::ApiCall_vkQueueNotifyOutOfBandNV);
2403124031
if (encoder)
2403224032
{
24033-
encoder->EncodeHandleValue<QueueWrapper>(queue);
24033+
encoder->EncodeHandleValue<vulkan_wrappers::QueueWrapper>(queue);
2403424034
EncodeStructPtr(encoder, pQueueTypeInfo);
2403524035
manager->EndApiCallCapture();
2403624036
}
2403724037

24038-
GetDeviceTable(queue)->QueueNotifyOutOfBandNV(queue, pQueueTypeInfo);
24038+
GetVulkanDeviceTable(queue)->QueueNotifyOutOfBandNV(queue, pQueueTypeInfo);
2403924039

2404024040
CustomEncoderPostCall<format::ApiCallId::ApiCall_vkQueueNotifyOutOfBandNV>::Dispatch(manager, queue, pQueueTypeInfo);
2404124041
}

‎framework/generated/generated_vulkan_struct_encoders.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9519,7 +9519,7 @@ void EncodeStruct(ParameterEncoder* encoder, const VkLatencySleepInfoNV& value)
95199519
{
95209520
encoder->EncodeEnumValue(value.sType);
95219521
EncodePNextStruct(encoder, value.pNext);
9522-
encoder->EncodeHandleValue<SemaphoreWrapper>(value.signalSemaphore);
9522+
encoder->EncodeHandleValue<vulkan_wrappers::SemaphoreWrapper>(value.signalSemaphore);
95239523
encoder->EncodeUInt64Value(value.value);
95249524
}
95259525

0 commit comments

Comments
 (0)