Emulation/GPCS4
1
0
Fork 0
mirror of https://github.com/Inori/GPCS4.git synced 2024-06-02 19:38:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some state errors

Browse source
This commit is contained in:
Asuka 2022-07-04 23:03:50 +08:00
parent 8f61f78cff
commit 25187a5c85
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
GPCS4/Graphics/Gnm/GnmCommandBufferDraw.cpp
View file

@ -133,6 +133,7 @@ namespace sce::Gnm
if (dirty)
{
m_state.gp.rs.numViewports = maxCount;
m_state.gp.rs.viewports[viewportId] = viewport;
m_flags.set(GnmContextFlag::DirtyViewportScissor);
@ -502,10 +503,16 @@ namespace sce::Gnm
ds.stencilOpFront.compareOp != stencilFront ||
ds.stencilOpBack.compareOp != stencilBack;
// When depth clear is enabled,
// we use render pass to clear the depth buffer,
// so we need to disable depth write to protect
// the cleared value not touched.
VkBool32 depthWrite = depthControl.zWrite &&
!m_state.gp.om.dsClear.enableDepthClear;
if (dirty)
{
ds.enableDepthTest = depthControl.depthEnable;
ds.enableDepthWrite = depthControl.zWrite;
ds.enableDepthWrite = depthWrite;
ds.enableStencilTest = depthControl.stencilEnable;
ds.depthCompareOp = depthCmpOp;
ds.stencilOpFront.compareOp = stencilFront;
@ -1225,6 +1232,11 @@ namespace sce::Gnm
void GnmCommandBufferDraw::applyRenderState()
{
if (m_flags.test(GnmContextFlag::DirtyRenderTargets))
{
appplyRenderTargets();
}
if (m_flags.test(GnmContextFlag::DirtyBlendState))
{
applyBlendState();
@ -1325,6 +1337,14 @@ namespace sce::Gnm
m_flags.clr(GnmContextFlag::DirtyViewportScissor);
}
void GnmCommandBufferDraw::appplyRenderTargets()
{
m_context->bindRenderTargets(
m_state.gp.om.renderTargets);
m_flags.clr(GnmContextFlag::DirtyRenderTargets);
}
void GnmCommandBufferDraw::initDefaultRenderState()
{
m_state.gp.sc = {};
@ -1418,5 +1438,4 @@ namespace sce::Gnm
}
} // namespace sce::Gnm

2
GPCS4/Graphics/Gnm/GnmCommandBufferDraw.h
View file

@ -211,6 +211,8 @@ namespace sce::Gnm
void applyViewportState();
void appplyRenderTargets();
void initDefaultRenderState();
static void initDefaultPrimitiveTopology(