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

[d3d11] RestoreState: Restore framebuffer and shader bindings

This commit is contained in:
Philip Rebohle 2018-03-10 10:19:07 +01:00
parent 3efd437310
commit d1a2cff9ac
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/d3d11/d3d11_context.cpp
View File

@ -1190,11 +1190,7 @@ namespace dxvk {
if (m_state.vs.shader != shader) {
m_state.vs.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_VERTEX_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_VERTEX_BIT);
}
}
@ -1285,11 +1281,7 @@ namespace dxvk {
if (m_state.hs.shader != shader) {
m_state.hs.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT);
}
}
@ -1380,11 +1372,7 @@ namespace dxvk {
if (m_state.ds.shader != shader) {
m_state.ds.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT);
}
}
@ -1475,11 +1463,7 @@ namespace dxvk {
if (m_state.gs.shader != shader) {
m_state.gs.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_GEOMETRY_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_GEOMETRY_BIT);
}
}
@ -1570,11 +1554,7 @@ namespace dxvk {
if (m_state.ps.shader != shader) {
m_state.ps.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_FRAGMENT_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_FRAGMENT_BIT);
}
}
@ -1665,11 +1645,7 @@ namespace dxvk {
if (m_state.cs.shader != shader) {
m_state.cs.shader = shader;
EmitCs([cShader = shader != nullptr ? shader->GetShader() : nullptr]
(DxvkContext* ctx) {
ctx->bindShader(VK_SHADER_STAGE_COMPUTE_BIT, cShader);
});
BindShader(shader, VK_SHADER_STAGE_COMPUTE_BIT);
}
}
@ -2364,9 +2340,19 @@ namespace dxvk {
void D3D11DeviceContext::RestoreState() {
Logger::err("D3D11DeviceContext::RestoreState: Not implemented");
static bool s_errorShown = false;
if (!std::exchange(s_errorShown, true))
Logger::err("D3D11DeviceContext::RestoreState: Incomplete");
BindFramebuffer();
BindShader(m_state.vs.shader.ptr(), VK_SHADER_STAGE_VERTEX_BIT);
BindShader(m_state.hs.shader.ptr(), VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT);
BindShader(m_state.ds.shader.ptr(), VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT);
BindShader(m_state.gs.shader.ptr(), VK_SHADER_STAGE_GEOMETRY_BIT);
BindShader(m_state.ps.shader.ptr(), VK_SHADER_STAGE_FRAGMENT_BIT);
BindShader(m_state.cs.shader.ptr(), VK_SHADER_STAGE_COMPUTE_BIT);
}

12
src/d3d11/d3d11_context.h
View File

@ -529,6 +529,18 @@ namespace dxvk {
void BindFramebuffer();
template<typename T>
void BindShader(
T* Shader,
VkShaderStageFlagBits Stage) {
EmitCs([
cShader = Shader != nullptr ? Shader->GetShader() : nullptr,
cStage = Stage
] (DxvkContext* ctx) {
ctx->bindShader(cStage, cShader);
});
}
void BindConstantBuffers(
DxbcProgramType ShaderStage,
D3D11ConstantBufferBindings& Bindings,