backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] Refactored D3D11DepthStencilState creation

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-18 23:32:01 +01:00
parent 11d8eb3be4
commit b04e9b5f18
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/d3d11/d3d11_depth_stencil.cpp
View File

@ -51,6 +51,33 @@ namespace dxvk {
} }
D3D11_DEPTH_STENCIL_DESC D3D11DepthStencilState::DefaultDesc() {
D3D11_DEPTH_STENCILOP_DESC stencilOp;
stencilOp.StencilFunc = D3D11_COMPARISON_ALWAYS;
stencilOp.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
stencilOp.StencilPassOp = D3D11_STENCIL_OP_KEEP;
stencilOp.StencilFailOp = D3D11_STENCIL_OP_KEEP;
D3D11_DEPTH_STENCIL_DESC dstDesc;
dstDesc.DepthEnable = TRUE;
dstDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
dstDesc.DepthFunc = D3D11_COMPARISON_LESS;
dstDesc.StencilEnable = FALSE;
dstDesc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;
dstDesc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
dstDesc.FrontFace = stencilOp;
dstDesc.BackFace = stencilOp;
return dstDesc;
}
HRESULT D3D11DepthStencilState::NormalizeDesc(D3D11_DEPTH_STENCIL_DESC* pDesc) {
// TODO validate
// TODO clear unused values
return S_OK;
}
VkStencilOpState D3D11DepthStencilState::DecodeStencilOpState( VkStencilOpState D3D11DepthStencilState::DecodeStencilOpState(
const D3D11_DEPTH_STENCILOP_DESC& StencilDesc, const D3D11_DEPTH_STENCILOP_DESC& StencilDesc,
const D3D11_DEPTH_STENCIL_DESC& Desc) const { const D3D11_DEPTH_STENCIL_DESC& Desc) const {

5
src/d3d11/d3d11_depth_stencil.h
View File

@ -33,6 +33,11 @@ namespace dxvk {
void BindToContext( void BindToContext(
const Rc<DxvkContext>& ctx); const Rc<DxvkContext>& ctx);
static D3D11_DEPTH_STENCIL_DESC DefaultDesc();
static HRESULT NormalizeDesc(
D3D11_DEPTH_STENCIL_DESC* pDesc);
private: private:
D3D11Device* const m_device; D3D11Device* const m_device;

24
src/d3d11/d3d11_device.cpp
View File

@ -1114,26 +1114,12 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D11Device::CreateDepthStencilState( HRESULT STDMETHODCALLTYPE D3D11Device::CreateDepthStencilState(
const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc, const D3D11_DEPTH_STENCIL_DESC* pDepthStencilDesc,
ID3D11DepthStencilState** ppDepthStencilState) { ID3D11DepthStencilState** ppDepthStencilState) {
D3D11_DEPTH_STENCIL_DESC desc; D3D11_DEPTH_STENCIL_DESC desc = pDepthStencilDesc != nullptr
? *pDepthStencilDesc
: D3D11DepthStencilState::DefaultDesc();
if (pDepthStencilDesc != nullptr) { if (FAILED(D3D11DepthStencilState::NormalizeDesc(&desc)))
desc = *pDepthStencilDesc; return E_INVALIDARG;
} else {
D3D11_DEPTH_STENCILOP_DESC stencilOp;
stencilOp.StencilFunc = D3D11_COMPARISON_ALWAYS;
stencilOp.StencilDepthFailOp = D3D11_STENCIL_OP_KEEP;
stencilOp.StencilPassOp = D3D11_STENCIL_OP_KEEP;
stencilOp.StencilFailOp = D3D11_STENCIL_OP_KEEP;
desc.DepthEnable = TRUE;
desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
desc.DepthFunc = D3D11_COMPARISON_LESS;
desc.StencilEnable = FALSE;
desc.StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;
desc.StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;
desc.FrontFace = stencilOp;
desc.BackFace = stencilOp;
}
if (ppDepthStencilState != nullptr) { if (ppDepthStencilState != nullptr) {
*ppDepthStencilState = m_dsStateObjects.Create(this, desc); *ppDepthStencilState = m_dsStateObjects.Create(this, desc);