Skip to content

Add missing IID checks for creating ID3D12CommandQueue1 #3759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheRealMJP wants to merge 3 commits into
base: v1.x
Choose a base branch
from
+39 −10
Open

Add missing IID checks for creating ID3D12CommandQueue1 #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af44872
Add missing IID checks for creating ID3D12CommandQueue1
TheRealMJP Jan 5, 2026
87de13d
Use proper interface pointer casting during D3D12 CommandQueue creation
TheRealMJP Jan 6, 2026
750cb16
Add proper casts when returning the wrapped command queue
TheRealMJP Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions renderdoc/driver/d3d12/d3d12_device_wrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,14 @@ bool WrappedID3D12Device::Serialise_CreateCommandQueue(SerialiserType &ser,

if(IsReplayingAndReading())
{
void *realptr = NULL;
HRESULT hr = m_pDevice->CreateCommandQueue(&Descriptor, guid, &realptr);

ID3D12CommandQueue *ret = NULL;
HRESULT hr = m_pDevice->CreateCommandQueue(&Descriptor, guid, (void **)&ret);
if(guid == __uuidof(ID3D12CommandQueue))
ret = (ID3D12CommandQueue *)realptr;
else if(guid == __uuidof(ID3D12CommandQueue1))
ret = (ID3D12CommandQueue1 *)realptr;

if(FAILED(hr))
{
Expand Down Expand Up @@ -154,12 +160,17 @@ HRESULT WrappedID3D12Device::CreateCommandQueue(const D3D12_COMMAND_QUEUE_DESC *
if(ppCommandQueue == NULL)
return m_pDevice->CreateCommandQueue(pDesc, riid, NULL);

if(riid != __uuidof(ID3D12CommandQueue))
if(riid != __uuidof(ID3D12CommandQueue) && riid != __uuidof(ID3D12CommandQueue1))
return E_NOINTERFACE;

void *realptr = NULL;
HRESULT ret = m_pDevice->CreateCommandQueue(pDesc, riid, &realptr);

ID3D12CommandQueue *real = NULL;
HRESULT ret;
SERIALISE_TIME_CALL(ret = m_pDevice->CreateCommandQueue(pDesc, riid, (void **)&real));
if(riid == __uuidof(ID3D12CommandQueue))
real = (ID3D12CommandQueue *)realptr;
else if(riid == __uuidof(ID3D12CommandQueue1))
real = (ID3D12CommandQueue1 *)realptr;

if(SUCCEEDED(ret))
{
Expand Down Expand Up @@ -210,7 +221,10 @@ HRESULT WrappedID3D12Device::CreateCommandQueue(const D3D12_COMMAND_QUEUE_DESC *
wrapped->GetCreationRecord()->GetResourceID(), eFrameRef_Read);
}

*ppCommandQueue = (ID3D12CommandQueue *)wrapped;
if(riid == __uuidof(ID3D12CommandQueue))
*ppCommandQueue = (ID3D12CommandQueue *)wrapped;
else if(riid == __uuidof(ID3D12CommandQueue1))
*ppCommandQueue = (ID3D12CommandQueue1 *)wrapped;
}
else
{
Expand Down
25 changes: 20 additions & 5 deletions renderdoc/driver/d3d12/d3d12_device_wrap9.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,13 @@ bool WrappedID3D12Device::Serialise_CreateCommandQueue1(SerialiserType &ser,
HRESULT hr = E_NOINTERFACE;
if(m_pDevice9)
{
hr = m_pDevice9->CreateCommandQueue1(&Descriptor, creator, guid, (void **)&ret);
void *realptr = NULL;
hr = m_pDevice9->CreateCommandQueue1(&Descriptor, creator, guid, &realptr);

if(guid == __uuidof(ID3D12CommandQueue))
ret = (ID3D12CommandQueue *)realptr;
else if(guid == __uuidof(ID3D12CommandQueue1))
ret = (ID3D12CommandQueue1 *)realptr;
}
else
{
Expand Down Expand Up @@ -136,12 +142,18 @@ HRESULT WrappedID3D12Device::CreateCommandQueue1(const D3D12_COMMAND_QUEUE_DESC
if(ppCommandQueue == NULL)
return m_pDevice9->CreateCommandQueue1(pDesc, CreatorID, riid, NULL);

if(riid != __uuidof(ID3D12CommandQueue))
if(riid != __uuidof(ID3D12CommandQueue) && riid != __uuidof(ID3D12CommandQueue1))
return E_NOINTERFACE;

ID3D12CommandQueue *real = NULL;
void *realptr = NULL;
HRESULT ret;
SERIALISE_TIME_CALL(ret = m_pDevice9->CreateCommandQueue1(pDesc, CreatorID, riid, (void **)&real));
SERIALISE_TIME_CALL(ret = m_pDevice9->CreateCommandQueue1(pDesc, CreatorID, riid, &realptr));

ID3D12CommandQueue *real = NULL;
if(riid == __uuidof(ID3D12CommandQueue))
real = (ID3D12CommandQueue *)realptr;
else if(riid == __uuidof(ID3D12CommandQueue1))
real = (ID3D12CommandQueue1 *)realptr;

if(SUCCEEDED(ret))
{
Expand Down Expand Up @@ -192,7 +204,10 @@ HRESULT WrappedID3D12Device::CreateCommandQueue1(const D3D12_COMMAND_QUEUE_DESC
wrapped->GetCreationRecord()->GetResourceID(), eFrameRef_Read);
}

*ppCommandQueue = (ID3D12CommandQueue *)wrapped;
if(riid == __uuidof(ID3D12CommandQueue))
*ppCommandQueue = (ID3D12CommandQueue *)wrapped;
else if(riid == __uuidof(ID3D12CommandQueue1))
*ppCommandQueue = (ID3D12CommandQueue1 *)wrapped;
}
else
{
Expand Down
Loading