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

adjust render states

Browse source
This commit is contained in:
Asuka 2022-07-04 21:42:15 +08:00
parent 585aaa4532
commit 8f61f78cff
3 changed files with 86 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,12 +83,12 @@ namespace sce::Gnm
scissor.extent.width = right - left;
scissor.extent.height = bottom - top;
bool dirty = m_state.gp.rs.scissor.offset != scissor.offset ||
m_state.gp.rs.scissor.extent != scissor.extent;
bool dirty = m_state.gp.rs.screenScissor.offset != scissor.offset ||
m_state.gp.rs.screenScissor.extent != scissor.extent;
if (dirty)
{
m_state.gp.rs.scissor = scissor;
m_state.gp.rs.screenScissor = scissor;
m_flags.set(GnmContextFlag::DirtyViewportScissor);
}
}
@ -502,11 +502,6 @@ namespace sce::Gnm
ds.stencilOpFront.compareOp != stencilFront ||
ds.stencilOpBack.compareOp != stencilBack;
// In vulkan, depth write can only be enabled,
// when depth test is also enabled.
// If depth test is disabled then depth writes are also disabled,
// regardless of the value of
// VkPipelineDepthStencilStateCreateInfo::depthWriteEnable
if (dirty)
{
ds.enableDepthTest = depthControl.depthEnable;
@ -539,6 +534,12 @@ namespace sce::Gnm
depthWrite = VK_TRUE;
}
// In vulkan, depth write can only be enabled,
// when depth test is also enabled.
// If depth test is disabled then depth writes are also disabled,
// regardless of the value of
// VkPipelineDepthStencilStateCreateInfo::depthWriteEnable
if (m_state.gp.om.dsState.enableDepthWrite != depthWrite)
{
m_state.gp.om.dsState.enableDepthWrite = depthWrite;
@ -571,14 +572,9 @@ namespace sce::Gnm
}
LOG_ASSERT(topology != VK_PRIMITIVE_TOPOLOGY_MAX_ENUM, "primType not supported.");
m_state.gp.ia.isState.primitiveTopology = topology;
m_state.gp.ia.isState = { topology, VK_FALSE, 0 };
VltInputAssemblyState ia = {
topology,
VK_FALSE,
0
};
m_context->setInputAssemblyState(ia);
applyPrimitiveTopology();
}
void GnmCommandBufferDraw::setIndexSize(IndexSize indexSize, CachePolicy cachePolicy)
@ -697,8 +693,8 @@ namespace sce::Gnm
void GnmCommandBufferDraw::setDepthStencilDisable()
{
VltDepthStencilState ds = {};
m_context->setDepthStencilState(ds);
m_state.gp.om.dsState = VltDepthStencilState();
m_flags.set(GnmContextFlag::DirtyDepthStencilState);
}
void GnmCommandBufferDraw::setClipControl(ClipControl reg)
@ -1053,6 +1049,8 @@ namespace sce::Gnm
updatePixelShaderStage();
applyRenderState();
// Set default ms state
VltMultisampleState msState;
msState.enableAlphaToCoverage = VK_FALSE;
@ -1092,6 +1090,8 @@ namespace sce::Gnm
{
// This is the last cmd for a command buffer submission,
// we can do some finish works before submit and present.
applyRenderState();
}
void GnmCommandBufferDraw::updateMetaTextureInfo(
@ -1225,22 +1225,52 @@ namespace sce::Gnm
void GnmCommandBufferDraw::applyRenderState()
{
if (m_flags.test(GnmContextFlag::DirtyBlendState))
{
applyBlendState();
}
if (m_flags.test(GnmContextFlag::DirtyDepthStencilState))
{
applyDepthStencilState();
}
if (m_flags.test(GnmContextFlag::DirtyDepthStencilClear))
{
applyDepthStencilClear();
}
if (m_flags.test(GnmContextFlag::DirtyRasterizerState))
{
applyRasterizerState();
}
}
void GnmCommandBufferDraw::applyInputLayout()
{
if (m_flags.test(GnmContextFlag::DirtyViewportScissor))
{
applyViewportState();
}
}
void GnmCommandBufferDraw::applyPrimitiveTopology()
{
m_context->setInputAssemblyState(
m_state.gp.ia.isState);
}
void GnmCommandBufferDraw::applyBlendState()
{
const auto& bm = m_state.gp.om.blendModes;
for (uint32_t i = 0; i != bm.size(); ++i)
{
m_context->setBlendMode(i, bm[i]);
}
m_context->setLogicOpState(
m_state.gp.om.loState);
m_context->setMultisampleState(
m_state.gp.om.msState);
m_flags.clr(GnmContextFlag::DirtyBlendState);
}
void GnmCommandBufferDraw::applyBlendFactor()
@ -1249,6 +1279,18 @@ namespace sce::Gnm
void GnmCommandBufferDraw::applyDepthStencilState()
{
m_context->setDepthStencilState(
m_state.gp.om.dsState);
m_flags.clr(GnmContextFlag::DirtyDepthStencilState);
}
void GnmCommandBufferDraw::applyDepthStencilClear()
{
m_context->setDepthStencilClear(
m_state.gp.om.dsClear);
m_flags.clr(GnmContextFlag::DirtyDepthStencilClear);
}
void GnmCommandBufferDraw::applyStencilRef()
@ -1265,6 +1307,22 @@ namespace sce::Gnm
void GnmCommandBufferDraw::applyViewportState()
{
if (likely(m_state.gp.rs.numViewports == 1))
{
m_context->setViewports(1,
m_state.gp.rs.viewports.data(),
&m_state.gp.rs.screenScissor);
}
else
{
// TODO:
// How to set screen scissor together with viewport
// scissor ?
m_context->setViewports(m_state.gp.rs.numViewports,
m_state.gp.rs.viewports.data(),
m_state.gp.rs.scissors.data());
}
m_flags.clr(GnmContextFlag::DirtyViewportScissor);
}
void GnmCommandBufferDraw::initDefaultRenderState()
@ -1360,4 +1418,5 @@ namespace sce::Gnm
}
} // namespace sce::Gnm

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

@ -195,8 +195,6 @@ namespace sce::Gnm
void applyRenderState();
void applyInputLayout();
void applyPrimitiveTopology();
void applyBlendState();
@ -205,6 +203,8 @@ namespace sce::Gnm
void applyDepthStencilState();
void applyDepthStencilClear();
void applyStencilRef();
void applyRasterizerState();

7
GPCS4/Graphics/Gnm/GnmRenderState.h
View file

@ -65,8 +65,10 @@ namespace sce::Gnm
struct GnmRasterizerState
{
uint32_t numViewports = 0;
uint32_t numScissors = 0;
VkRect2D scissor;
VkRect2D screenScissor;
std::array<VkRect2D, MaxNumViewports> scissors;
std::array<VkViewport, MaxNumViewports> viewports;
vlt::VltRasterizerState state;
};
@ -78,7 +80,8 @@ namespace sce::Gnm
vlt::VltMultisampleState msState;
vlt::VltLogicOpState loState;
vlt::VltDepthStencilClear dsClear;
std::array<vlt::VltBlendMode, 8> blendModes;
std::array<vlt::VltBlendMode, MaxNumRenderTargets> blendModes;
float blendFactor[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
uint32_t sampleMask = 0xFFFFFFFFu;