rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[d3d10] Add some null pointer checks when dealing with resources

Browse Source 
Also, fix some more awkward formatting.
This commit is contained in:
Philip Rebohle 2019-09-23 21:56:50 +02:00
parent cb60211ce0
commit 8f6df2b7fb
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/d3d10/d3d10_device.cpp
View File

@ -223,7 +223,7 @@ namespace dxvk {
ID3D10ShaderResourceView** ppSRView) { ID3D10ShaderResourceView** ppSRView) {
InitReturnPtr(ppSRView); InitReturnPtr(ppSRView);
if (pResource == nullptr) if (!pResource)
return E_INVALIDARG; return E_INVALIDARG;
Com<ID3D11Resource> d3d11Resource; Com<ID3D11Resource> d3d11Resource;
@ -248,7 +248,7 @@ namespace dxvk {
ID3D10ShaderResourceView1** ppSRView) { ID3D10ShaderResourceView1** ppSRView) {
InitReturnPtr(ppSRView); InitReturnPtr(ppSRView);
if (pResource == nullptr) if (!pResource)
return E_INVALIDARG; return E_INVALIDARG;
Com<ID3D11Resource> d3d11Resource; Com<ID3D11Resource> d3d11Resource;
@ -273,7 +273,7 @@ namespace dxvk {
ID3D10RenderTargetView** ppRTView) { ID3D10RenderTargetView** ppRTView) {
InitReturnPtr(ppRTView); InitReturnPtr(ppRTView);
if (pResource == nullptr) if (!pResource)
return E_INVALIDARG; return E_INVALIDARG;
Com<ID3D11Resource> d3d11Resource; Com<ID3D11Resource> d3d11Resource;
@ -298,7 +298,7 @@ namespace dxvk {
ID3D10DepthStencilView** ppDepthStencilView) { ID3D10DepthStencilView** ppDepthStencilView) {
InitReturnPtr(ppDepthStencilView); InitReturnPtr(ppDepthStencilView);
if (pResource == nullptr) if (!pResource)
return E_INVALIDARG; return E_INVALIDARG;
Com<ID3D11Resource> d3d11Resource; Com<ID3D11Resource> d3d11Resource;
@ -753,7 +753,7 @@ namespace dxvk {
ppPredicate ? &d3d11Predicate : nullptr, ppPredicate ? &d3d11Predicate : nullptr,
pPredicateValue); pPredicateValue);
if (ppPredicate != nullptr) if (ppPredicate)
*ppPredicate = d3d11Predicate ? D3D11Query::FromPredicate(d3d11Predicate)->GetD3D10Iface() : nullptr; *ppPredicate = d3d11Predicate ? D3D11Query::FromPredicate(d3d11Predicate)->GetD3D10Iface() : nullptr;
} }
@ -767,9 +767,12 @@ namespace dxvk {
ID3D10Resource* pSrcResource, ID3D10Resource* pSrcResource,
UINT SrcSubresource, UINT SrcSubresource,
const D3D10_BOX* pSrcBox) { const D3D10_BOX* pSrcBox) {
if (!pDstResource || !pSrcResource)
return;
Com<ID3D11Resource> d3d11DstResource; Com<ID3D11Resource> d3d11DstResource;
Com<ID3D11Resource> d3d11SrcResource; Com<ID3D11Resource> d3d11SrcResource;
GetD3D11Resource(pDstResource, &d3d11DstResource); GetD3D11Resource(pDstResource, &d3d11DstResource);
GetD3D11Resource(pSrcResource, &d3d11SrcResource); GetD3D11Resource(pSrcResource, &d3d11SrcResource);
@ -783,6 +786,9 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D10Device::CopyResource( void STDMETHODCALLTYPE D3D10Device::CopyResource(
ID3D10Resource* pDstResource, ID3D10Resource* pDstResource,
ID3D10Resource* pSrcResource) { ID3D10Resource* pSrcResource) {
if (!pDstResource || !pSrcResource)
return;
Com<ID3D11Resource> d3d11DstResource; Com<ID3D11Resource> d3d11DstResource;
Com<ID3D11Resource> d3d11SrcResource; Com<ID3D11Resource> d3d11SrcResource;
@ -802,6 +808,9 @@ namespace dxvk {
const void* pSrcData, const void* pSrcData,
UINT SrcRowPitch, UINT SrcRowPitch,
UINT SrcDepthPitch) { UINT SrcDepthPitch) {
if (!pDstResource)
return;
Com<ID3D11Resource> d3d11DstResource; Com<ID3D11Resource> d3d11DstResource;
GetD3D11Resource(pDstResource, &d3d11DstResource); GetD3D11Resource(pDstResource, &d3d11DstResource);
@ -827,6 +836,9 @@ namespace dxvk {
ID3D10Resource* pSrcResource, ID3D10Resource* pSrcResource,
UINT SrcSubresource, UINT SrcSubresource,
DXGI_FORMAT Format) { DXGI_FORMAT Format) {
if (!pDstResource || !pSrcResource)
return;
Com<ID3D11Resource> d3d11DstResource; Com<ID3D11Resource> d3d11DstResource;
Com<ID3D11Resource> d3d11SrcResource; Com<ID3D11Resource> d3d11SrcResource;
@ -946,8 +958,9 @@ namespace dxvk {
ID3D11InputLayout* d3d11InputLayout = nullptr; ID3D11InputLayout* d3d11InputLayout = nullptr;
m_context->IAGetInputLayout(&d3d11InputLayout); m_context->IAGetInputLayout(&d3d11InputLayout);
*ppInputLayout = d3d11InputLayout ? static_cast<D3D11InputLayout*>( *ppInputLayout = d3d11InputLayout
d3d11InputLayout)->GetD3D10Iface() : nullptr; ? static_cast<D3D11InputLayout*>(d3d11InputLayout)->GetD3D10Iface()
: nullptr;
} }
@ -975,7 +988,7 @@ namespace dxvk {
ppVertexBuffers ? d3d11Buffers : nullptr, ppVertexBuffers ? d3d11Buffers : nullptr,
pStrides, pOffsets); pStrides, pOffsets);
if (ppVertexBuffers != nullptr) { if (ppVertexBuffers) {
for (uint32_t i = 0; i < NumBuffers; i++) { for (uint32_t i = 0; i < NumBuffers; i++) {
ppVertexBuffers[i] = d3d11Buffers[i] ppVertexBuffers[i] = d3d11Buffers[i]
? static_cast<D3D11Buffer*>(d3d11Buffers[i])->GetD3D10Iface() ? static_cast<D3D11Buffer*>(d3d11Buffers[i])->GetD3D10Iface()
@ -995,7 +1008,7 @@ namespace dxvk {
pIndexBuffer ? &d3d11Buffer : nullptr, pIndexBuffer ? &d3d11Buffer : nullptr,
Format, Offset); Format, Offset);
if (pIndexBuffer != nullptr) if (pIndexBuffer)
*pIndexBuffer = d3d11Buffer ? static_cast<D3D11Buffer*>(d3d11Buffer)->GetD3D10Iface() : nullptr; *pIndexBuffer = d3d11Buffer ? static_cast<D3D11Buffer*>(d3d11Buffer)->GetD3D10Iface() : nullptr;
} }