Skip to content

Commit

Permalink
QueryInterface to reinterpret_cast
Browse files Browse the repository at this point in the history
  • Loading branch information
@locke-lunarg
locke-lunarg committed Sep 26, 2024
1 parent 28046f0 commit a11fc5c
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 206 deletions.
69 changes: 35 additions & 34 deletions framework/encode/d3d12_capture_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1763,9 +1763,8 @@ void D3D12CaptureManager::PreProcess_ID3D12CommandQueue_ExecuteCommandLists(ID3D
{
DecrementCallScope();

auto target_cmdlist = lists[trim_draw_calls.command_index];
ID3D12CommandList_Wrapper* target_wrapper = nullptr;
target_cmdlist->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target_wrapper));
auto target_cmdlist = lists[trim_draw_calls.command_index];
auto target_wrapper = reinterpret_cast<ID3D12CommandList_Wrapper*>(target_cmdlist);
GFXRECON_ASSERT(target_wrapper);

auto target_info = target_wrapper->GetObjectInfo();
Expand Down Expand Up @@ -1900,9 +1899,8 @@ void D3D12CaptureManager::OverrideID3D12CommandQueue_ExecuteCommandLists(ID3D12C
DecrementCallScope();
common_manager_->ActivateTrimmingDrawCalls(format::ApiFamilyId::ApiFamily_D3D12);

auto target_cmdlist = lists[trim_draw_calls.command_index];
ID3D12CommandList_Wrapper* target_wrapper = nullptr;
target_cmdlist->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target_wrapper));
auto target_cmdlist = lists[trim_draw_calls.command_index];
auto target_wrapper = reinterpret_cast<ID3D12CommandList_Wrapper*>(target_cmdlist);
GFXRECON_ASSERT(target_wrapper);

auto target_info = target_wrapper->GetObjectInfo();
Expand Down Expand Up @@ -1953,8 +1951,7 @@ void D3D12CaptureManager::PostProcess_ID3D12CommandQueue_ExecuteCommandLists(ID3
bool is_split_commandlist = false;
for (uint32_t i = 0; i < num_lists; ++i)
{
ID3D12CommandList_Wrapper* cmd_wrapper = nullptr;
lists[i]->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&cmd_wrapper));
auto cmd_wrapper = reinterpret_cast<ID3D12CommandList_Wrapper*>(lists[0]);
GFXRECON_ASSERT(cmd_wrapper);

auto cmd_info = cmd_wrapper->GetObjectInfo();
Expand Down Expand Up @@ -3012,8 +3009,8 @@ HRESULT D3D12CaptureManager::OverrideID3D12GraphicsCommandList_Reset(ID3D12Graph
GetCommandListsForTrimDrawCalls(wrapper, format::ApiCall_ID3D12GraphicsCommandList_Reset);
for (auto& command_set : trim_draw_calls_command_sets)
{
ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&list_wrapper));
auto list_wrapper = reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(command_set.list.GetInterfacePtr());
GFXRECON_ASSERT(list_wrapper);
HRESULT result_trim_draw_calls = list_wrapper->Reset(command_set.allocator, pInitialState);

if (result != result_trim_draw_calls)
Expand Down Expand Up @@ -3045,8 +3042,7 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
if (trim_draw_calls_command_sets.size() == 3)
{
// Here is the target draw call for trim draw calls.
ID3D12GraphicsCommandList_Wrapper* bunlde_wrapper = nullptr;
pCommandList->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&bunlde_wrapper));
auto bunlde_wrapper = reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(pCommandList);
GFXRECON_ASSERT(bunlde_wrapper);

auto bundle_info = bunlde_wrapper->GetObjectInfo();
Expand All @@ -3061,8 +3057,7 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
{
GFXRECON_ASSERT(bundle_info->split_command_sets[i].list);

ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&list_wrapper));
auto list_wrapper = reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(command_set.list.GetInterfacePtr());
GFXRECON_ASSERT(list_wrapper);

list_wrapper->ExecuteBundle(bundle_info->split_command_sets[i].list);
Expand All @@ -3071,9 +3066,8 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList_ExecuteBundle(ID3D12
}
else if (trim_draw_calls_command_sets.size() == 1)
{
ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
trim_draw_calls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
reinterpret_cast<void**>(&list_wrapper));
auto list_wrapper =
reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(trim_draw_calls_command_sets[0].list.GetInterfacePtr());
GFXRECON_ASSERT(list_wrapper);
list_wrapper->ExecuteBundle(pCommandList);
}
Expand Down Expand Up @@ -3122,9 +3116,10 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
p_before_ds_desc = &before_ds_desc;
}

ID3D12GraphicsCommandList4_Wrapper* before4_wrappr = nullptr;
graphics::dx12::ID3D12GraphicsCommandList4ComPtr before4 = nullptr;
trim_draw_calls_command_sets[graphics::dx12::kBeforeDrawCallArrayIndex].list->QueryInterface(
IID_IUnknown_Wrapper, reinterpret_cast<void**>(&before4_wrappr));
IID_PPV_ARGS(&before4));
auto before4_wrappr = reinterpret_cast<ID3D12GraphicsCommandList4_Wrapper*>(before4.GetInterfacePtr());
GFXRECON_ASSERT(before4_wrappr);

before4_wrappr->BeginRenderPass(NumRenderTargets, before_rt_descs.data(), p_before_ds_desc, Flags);
Expand All @@ -3151,9 +3146,10 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
p_target_ds_desc = &target_ds_desc;
}

ID3D12GraphicsCommandList4_Wrapper* target4_wrapper = nullptr;
graphics::dx12::ID3D12GraphicsCommandList4ComPtr target4 = nullptr;
trim_draw_calls_command_sets[graphics::dx12::kDrawCallArrayIndex].list->QueryInterface(
IID_IUnknown_Wrapper, reinterpret_cast<void**>(&target4_wrapper));
IID_PPV_ARGS(&target4));
auto target4_wrapper = reinterpret_cast<ID3D12GraphicsCommandList4_Wrapper*>(target4.GetInterfacePtr());
GFXRECON_ASSERT(target4_wrapper);

target4_wrapper->BeginRenderPass(NumRenderTargets, target_rt_descs.data(), p_target_ds_desc, Flags);
Expand All @@ -3177,19 +3173,21 @@ void D3D12CaptureManager::OverrideID3D12GraphicsCommandList4_BeginRenderPass(
p_after_ds_desc = &after_ds_desc;
}

ID3D12GraphicsCommandList4_Wrapper* after4_wrapper = nullptr;
graphics::dx12::ID3D12GraphicsCommandList4ComPtr after4 = nullptr;
trim_draw_calls_command_sets[graphics::dx12::kAfterDrawCallArrayIndex].list->QueryInterface(
IID_IUnknown_Wrapper, reinterpret_cast<void**>(&after4_wrapper));
IID_PPV_ARGS(&after4));
auto after4_wrapper = reinterpret_cast<ID3D12GraphicsCommandList4_Wrapper*>(after4.GetInterfacePtr());
GFXRECON_ASSERT(after4_wrapper);

after4_wrapper->BeginRenderPass(NumRenderTargets, after_rt_descs.data(), p_after_ds_desc, Flags);
}
else if (trim_draw_calls_command_sets.size() == 1)
{
ID3D12GraphicsCommandList4_Wrapper* list4_wrapper = nullptr;
trim_draw_calls_command_sets[0].list->QueryInterface(IID_IUnknown_Wrapper,
reinterpret_cast<void**>(&list4_wrapper));
graphics::dx12::ID3D12GraphicsCommandList4ComPtr list4 = nullptr;
trim_draw_calls_command_sets[0].list->QueryInterface(IID_PPV_ARGS(&list4));
auto list4_wrapper = reinterpret_cast<ID3D12GraphicsCommandList4_Wrapper*>(list4.GetInterfacePtr());
GFXRECON_ASSERT(list4_wrapper);

list4_wrapper->BeginRenderPass(NumRenderTargets, pRenderTargets, pDepthStencil, Flags);
}
IncrementCallScope();
Expand Down Expand Up @@ -3446,8 +3444,7 @@ D3D12CaptureManager::GetCommandListsForTrimDrawCalls(ID3D12CommandList_Wrapper*
HRESULT ret = wrapper->GetDevice(IID_PPV_ARGS(&device));
GFXRECON_ASSERT(SUCCEEDED(ret));

ID3D12Device_Wrapper* device_wrapper = nullptr;
device->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&device_wrapper));
auto device_wrapper = reinterpret_cast<ID3D12Device_Wrapper*>(device.GetInterfacePtr());
GFXRECON_ASSERT(device_wrapper);

for (auto& command_set : cmd_list_info->split_command_sets)
Expand All @@ -3459,8 +3456,8 @@ D3D12CaptureManager::GetCommandListsForTrimDrawCalls(ID3D12CommandList_Wrapper*
device_wrapper->CreateCommandList(
0, cmd_list_info->command_list_type, command_set.allocator, nullptr, IID_PPV_ARGS(&command_set.list));

ID3D12CommandList_Wrapper* split_list_wrapper = nullptr;
command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&split_list_wrapper));
auto split_list_wrapper = reinterpret_cast<ID3D12CommandList_Wrapper*>(command_set.list.GetInterfacePtr());
GFXRECON_ASSERT(split_list_wrapper);
auto split_list_info = split_list_wrapper->GetObjectInfo();
split_list_info->is_split_commandlist = true;
}
Expand Down Expand Up @@ -3512,16 +3509,20 @@ D3D12CaptureManager::GetCommandListsForTrimDrawCalls(ID3D12CommandList_Wrapper*
{
for (auto& command_set : cmd_list_info->split_command_sets)
{
ID3D12GraphicsCommandList_Wrapper* list_wrapper = nullptr;
command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&list_wrapper));
auto list_wrapper =
reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(command_set.list.GetInterfacePtr());
GFXRECON_ASSERT(list_wrapper);

auto list_info = list_wrapper->GetObjectInfo();
if (!list_info->is_closed)
{
list_wrapper->Close();
}

ID3D12CommandAllocator_Wrapper* alc_wrapper = nullptr;
command_set.allocator->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&alc_wrapper));
auto alc_wrapper =
reinterpret_cast<ID3D12CommandAllocator_Wrapper*>(command_set.allocator.GetInterfacePtr());
GFXRECON_ASSERT(alc_wrapper);

alc_wrapper->Reset();
cmd_sets.emplace_back(command_set);
}
Expand Down
8 changes: 3 additions & 5 deletions framework/generated/dx12_generators/dx12_wrapper_body_generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -797,13 +797,11 @@ def write_class_member_def(self, class_info, indent=''):
expr += indent1 + '{\n'

if class_name != 'ID3D12GraphicsCommandList':
expr += indent2 + '{}* command_list;\n'.format(class_name)
expr += indent2 + 'graphics::dx12::{}ComPtr command_list = nullptr;\n'.format(class_name)
expr += indent2 + 'command_set.list->QueryInterface(IID_PPV_ARGS(&command_list));\n'
expr += indent2 + '{}_Wrapper* wrapper = nullptr;\n'.format(class_name)
expr += indent2 + 'command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));\n'
expr += indent2 + 'auto* wrapper = reinterpret_cast<{}_Wrapper*>(command_list.GetInterfacePtr());\n'.format(class_name)
else:
expr += indent2 + 'ID3D12GraphicsCommandList_Wrapper* wrapper = nullptr;\n'
expr += indent2 + 'command_set.list->QueryInterface(IID_IUnknown_Wrapper, reinterpret_cast<void**>(&wrapper));\n'
expr += indent2 + 'auto* wrapper = reinterpret_cast<ID3D12GraphicsCommandList_Wrapper*>(command_set.list.GetInterfacePtr());\n'

if return_type != 'void':
expr += indent2 + 'HRESULT result_trim_draw_calls = wrapper'
Expand Down
Loading

0 comments on commit a11fc5c

Please sign in to comment.