mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d10] Fix some awkward formatting

This commit is contained in:
Philip Rebohle 2019-09-23 21:47:30 +02:00
parent f498e742ec
commit cb60211ce0
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/d3d10/d3d10_device.cpp
View File

@ -110,11 +110,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SUBRESOURCE_DATA*>(pInitialData),
ppBuffer != nullptr ? &d3d11Buffer : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppBuffer = static_cast<D3D11Buffer*>(d3d11Buffer)->GetD3D10Iface();
return S_OK;
}
@ -143,11 +142,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SUBRESOURCE_DATA*>(pInitialData),
ppTexture1D != nullptr ? &d3d11Texture1D : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppTexture1D = static_cast<D3D11Texture1D*>(d3d11Texture1D)->GetD3D10Iface();
return S_OK;
}
@ -178,11 +176,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SUBRESOURCE_DATA*>(pInitialData),
ppTexture2D != nullptr ? &d3d11Texture2D : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppTexture2D = static_cast<D3D11Texture2D*>(d3d11Texture2D)->GetD3D10Iface();
return S_OK;
}
@ -212,11 +209,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SUBRESOURCE_DATA*>(pInitialData),
ppTexture3D != nullptr ? &d3d11Texture3D : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppTexture3D = static_cast<D3D11Texture3D*>(d3d11Texture3D)->GetD3D10Iface();
return S_OK;
}
@ -238,11 +234,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SHADER_RESOURCE_VIEW_DESC*>(pDesc),
ppSRView ? &d3d11Srv : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppSRView = static_cast<D3D11ShaderResourceView*>(d3d11Srv)->GetD3D10Iface();
return S_OK;
}
@ -264,11 +259,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_SHADER_RESOURCE_VIEW_DESC*>(pDesc),
ppSRView ? &d3d11View : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppSRView = static_cast<D3D11ShaderResourceView*>(d3d11View)->GetD3D10Iface();
return S_OK;
}
@ -290,11 +284,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_RENDER_TARGET_VIEW_DESC*>(pDesc),
ppRTView ? &d3d11View : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppRTView = static_cast<D3D11RenderTargetView*>(d3d11View)->GetD3D10Iface();
return S_OK;
}
@ -359,11 +352,10 @@ namespace dxvk {
d3d11Resource.ptr(), pDesc ? &d3d11Desc : nullptr,
ppDepthStencilView ? &d3d11View : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppDepthStencilView = static_cast<D3D11DepthStencilView*>(d3d11View)->GetD3D10Iface();
return S_OK;
}
@ -385,11 +377,10 @@ namespace dxvk {
NumElements, pShaderBytecodeWithInputSignature, BytecodeLength,
ppInputLayout ? &d3d11InputLayout : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppInputLayout = static_cast<D3D11InputLayout*>(d3d11InputLayout)->GetD3D10Iface();
return hr;
}
@ -406,11 +397,10 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, nullptr,
ppVertexShader ? &d3d11Shader : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppVertexShader = static_cast<D3D11VertexShader*>(d3d11Shader)->GetD3D10Iface();
return S_OK;
}
@ -427,11 +417,10 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, nullptr,
ppGeometryShader ? &d3d11Shader : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppGeometryShader = static_cast<D3D11GeometryShader*>(d3d11Shader)->GetD3D10Iface();
return S_OK;
}
@ -466,11 +455,10 @@ namespace dxvk {
D3D11_SO_NO_RASTERIZED_STREAM, nullptr,
ppGeometryShader ? &d3d11Shader : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppGeometryShader = static_cast<D3D11GeometryShader*>(d3d11Shader)->GetD3D10Iface();
return S_OK;
}
@ -487,11 +475,10 @@ namespace dxvk {
pShaderBytecode, BytecodeLength, nullptr,
ppPixelShader ? &d3d11Shader : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppPixelShader = static_cast<D3D11PixelShader*>(d3d11Shader)->GetD3D10Iface();
return S_OK;
}
@ -523,11 +510,10 @@ namespace dxvk {
HRESULT hr = m_device->CreateBlendState(&d3d11Desc,
ppBlendState ? &d3d11BlendState : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppBlendState = static_cast<D3D11BlendState*>(d3d11BlendState)->GetD3D10Iface();
return S_OK;
}
@ -542,11 +528,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_BLEND_DESC*>(pBlendStateDesc),
ppBlendState ? &d3d11BlendState : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppBlendState = static_cast<D3D11BlendState*>(d3d11BlendState)->GetD3D10Iface();
return S_OK;
}
@ -561,11 +546,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_DEPTH_STENCIL_DESC*>(pDepthStencilDesc),
ppDepthStencilState ? &d3d11DepthStencilState : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppDepthStencilState = static_cast<D3D11DepthStencilState*>(d3d11DepthStencilState)->GetD3D10Iface();
return S_OK;
}
@ -580,11 +564,10 @@ namespace dxvk {
reinterpret_cast<const D3D11_RASTERIZER_DESC*>(pRasterizerDesc),
ppRasterizerState ? &d3d11RasterizerState : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppRasterizerState = static_cast<D3D11RasterizerState*>(d3d11RasterizerState)->GetD3D10Iface();
return S_OK;
}
@ -615,11 +598,10 @@ namespace dxvk {
HRESULT hr = m_device->CreateSamplerState(&d3d11Desc,
ppSamplerState ? &d3d11SamplerState : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppSamplerState = static_cast<D3D11SamplerState*>(d3d11SamplerState)->GetD3D10Iface();
return S_OK;
}
@ -640,11 +622,10 @@ namespace dxvk {
HRESULT hr = m_device->CreateQuery(&d3d11Desc,
ppQuery ? &d3d11Query : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppQuery = static_cast<D3D11Query*>(d3d11Query)->GetD3D10Iface();
return S_OK;
}
@ -662,7 +643,7 @@ namespace dxvk {
HRESULT hr = m_device->CreatePredicate(&d3d11Desc,
ppPredicate ? &d3d11Predicate : nullptr);
if (FAILED(hr) || hr == S_FALSE)
if (hr != S_OK)
return hr;
*ppPredicate = D3D11Query::FromPredicate(d3d11Predicate)->GetD3D10Iface();