rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-11-30 04:24:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Don't use a state object for default blend state

Browse Source
This commit is contained in:
Philip Rebohle 2019-10-13 23:04:15 +02:00
parent c30fd8fb97
commit 12f0f8b13f
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/d3d11/d3d11_context.cpp
View File

@ -21,16 +21,7 @@ namespace dxvk {
m_csFlags (CsFlags), m_csFlags (CsFlags),
m_csChunk (AllocCsChunk()), m_csChunk (AllocCsChunk()),
m_cmdData (nullptr) { m_cmdData (nullptr) {
// Create default state objects. We won't ever return them
// to the application, but we'll use them to apply state.
Com<ID3D11BlendState> defaultBlendState;
if (FAILED(m_parent->CreateBlendState (nullptr, &defaultBlendState)))
throw DxvkError("D3D11DeviceContext: Failed to create default state objects");
// Apply default state to the context. This is required
// in order to initialize the DXVK contex properly.
m_defaultBlendState = static_cast<D3D11BlendState*> (defaultBlendState.ptr());
} }
@ -3220,17 +3211,29 @@ namespace dxvk {
void D3D11DeviceContext::ApplyBlendState() { void D3D11DeviceContext::ApplyBlendState() {
auto cbState = m_state.om.cbState.prvRef(); if (m_state.om.cbState != nullptr) {
if (unlikely(cbState == nullptr))
cbState = m_defaultBlendState.prvRef();
EmitCs([ EmitCs([
cBlendState = std::move(cbState), cBlendState = m_state.om.cbState.prvRef(),
cSampleMask = m_state.om.sampleMask cSampleMask = m_state.om.sampleMask
] (DxvkContext* ctx) { ] (DxvkContext* ctx) {
cBlendState->BindToContext(ctx, cSampleMask); cBlendState->BindToContext(ctx, cSampleMask);
}); });
} else {
EmitCs([
cSampleMask = m_state.om.sampleMask
] (DxvkContext* ctx) {
DxvkBlendMode cbState;
DxvkLogicOpState loState;
DxvkMultisampleState msState;
InitDefaultBlendState(&cbState, &loState, &msState, cSampleMask);
for (uint32_t i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++)
ctx->setBlendMode(i, cbState);
ctx->setLogicOpState(loState);
ctx->setMultisampleState(msState);
});
}
} }
@ -3778,9 +3781,7 @@ namespace dxvk {
void D3D11DeviceContext::ResetState() { void D3D11DeviceContext::ResetState() {
EmitCs([ EmitCs([] (DxvkContext* ctx) {
cBlendState = m_defaultBlendState.prvRef()
] (DxvkContext* ctx) {
// Reset render targets // Reset render targets
ctx->bindRenderTargets(DxvkRenderTargets()); ctx->bindRenderTargets(DxvkRenderTargets());
@ -3797,11 +3798,19 @@ namespace dxvk {
DxvkRasterizerState rsState; DxvkRasterizerState rsState;
InitDefaultRasterizerState(&rsState); InitDefaultRasterizerState(&rsState);
DxvkBlendMode cbState;
DxvkLogicOpState loState;
DxvkMultisampleState msState;
InitDefaultBlendState(&cbState, &loState, &msState, D3D11_DEFAULT_SAMPLE_MASK);
ctx->setInputAssemblyState(iaState); ctx->setInputAssemblyState(iaState);
ctx->setDepthStencilState(dsState); ctx->setDepthStencilState(dsState);
ctx->setRasterizerState(rsState); ctx->setRasterizerState(rsState);
ctx->setLogicOpState(loState);
ctx->setMultisampleState(msState);
cBlendState->BindToContext(ctx, D3D11_DEFAULT_SAMPLE_MASK); for (uint32_t i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; i++)
ctx->setBlendMode(i, cbState);
// Reset dynamic states // Reset dynamic states
ctx->setBlendConstants(DxvkBlendConstants { 1.0f, 1.0f, 1.0f, 1.0f }); ctx->setBlendConstants(DxvkBlendConstants { 1.0f, 1.0f, 1.0f, 1.0f });
@ -4304,4 +4313,27 @@ namespace dxvk {
pDsState->stencilOpBack = stencilOp; pDsState->stencilOpBack = stencilOp;
} }
void D3D11DeviceContext::InitDefaultBlendState(
DxvkBlendMode* pCbState,
DxvkLogicOpState* pLoState,
DxvkMultisampleState* pMsState,
UINT SampleMask) {
pCbState->enableBlending = VK_FALSE;
pCbState->colorSrcFactor = VK_BLEND_FACTOR_ONE;
pCbState->colorDstFactor = VK_BLEND_FACTOR_ZERO;
pCbState->colorBlendOp = VK_BLEND_OP_ADD;
pCbState->alphaSrcFactor = VK_BLEND_FACTOR_ONE;
pCbState->alphaDstFactor = VK_BLEND_FACTOR_ZERO;
pCbState->alphaBlendOp = VK_BLEND_OP_ADD;
pCbState->writeMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT
| VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
pLoState->enableLogicOp = VK_FALSE;
pLoState->logicOp = VK_LOGIC_OP_NO_OP;
pMsState->sampleMask = SampleMask;
pMsState->enableAlphaToCoverage = VK_FALSE;
}
} }

8
src/d3d11/d3d11_context.h
View File

@ -717,8 +717,6 @@ namespace dxvk {
DxvkCsChunkFlags m_csFlags; DxvkCsChunkFlags m_csFlags;
DxvkCsChunkRef m_csChunk; DxvkCsChunkRef m_csChunk;
Com<D3D11BlendState> m_defaultBlendState;
D3D11ContextState m_state; D3D11ContextState m_state;
D3D11CmdData* m_cmdData; D3D11CmdData* m_cmdData;
@ -911,6 +909,12 @@ namespace dxvk {
static void InitDefaultDepthStencilState( static void InitDefaultDepthStencilState(
DxvkDepthStencilState* pDsState); DxvkDepthStencilState* pDsState);
static void InitDefaultBlendState(
DxvkBlendMode* pCbState,
DxvkLogicOpState* pLoState,
DxvkMultisampleState* pMsState,
UINT SampleMask);
template<typename T> template<typename T>
const D3D11CommonShader* GetCommonShader(T* pShader) const { const D3D11CommonShader* GetCommonShader(T* pShader) const {
return pShader != nullptr ? pShader->GetCommonShader() : nullptr; return pShader != nullptr ? pShader->GetCommonShader() : nullptr;