raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-20 19:07:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix separate stencil test and write values

Browse Source
This commit is contained in:
nmzik
2026-09-14 12:24:03 +04:00
parent 940e42f130
commit 586cbd4a0d
2 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/host_gpu/renderer/depthRenderTarget.cpp
+30 -12
View File
@@ -39,8 +39,7 @@ namespace Libs::Graphics {
EXIT("unsupported render state; details were printed above\n");
}
static vk::StencilOp ConvertStencilOp(uint8_t value, uint8_t write_mask, uint8_t op_value,
uint8_t test_value) {
static vk::StencilOp ConvertStencilOp(uint8_t value, uint8_t write_mask, uint8_t op_value) {
if (write_mask == 0) {
return vk::StencilOp::eKeep;
}
@@ -52,11 +51,6 @@ static vk::StencilOp ConvertStencilOp(uint8_t value, uint8_t write_mask, uint8_t
if ((op_value & write_mask) == 0) {
return vk::StencilOp::eZero;
}
if (((op_value ^ test_value) & write_mask) != 0) {
DepthFatal("unsupported stencil replacement: write mask=0x%02" PRIx8
", operation value=0x%02" PRIx8 ", test value=0x%02" PRIx8,
write_mask, op_value, test_value);
}
return vk::StencilOp::eReplace;
case Prospero::StencilOp::kAddClamp: return vk::StencilOp::eIncrementAndClamp;
case Prospero::StencilOp::kSubClamp: return vk::StencilOp::eDecrementAndClamp;
@@ -80,11 +74,35 @@ static vk::StencilOp ConvertStencilOp(uint8_t value, uint8_t write_mask, uint8_t
static PipelineStencilStaticState ConvertStencilState(
uint8_t compare, const std::array<uint8_t, 3>& operations, uint8_t op_value,
PipelineStencilDynamicState& dynamic) {
return {
ConvertStencilOp(operations[0], dynamic.writeMask, op_value, dynamic.reference),
ConvertStencilOp(operations[1], dynamic.writeMask, op_value, dynamic.reference),
ConvertStencilOp(operations[2], dynamic.writeMask, op_value, dynamic.reference),
static_cast<vk::CompareOp>(compare)};
const auto test_value = dynamic.reference;
auto reference = test_value;
auto required_bits = dynamic.compareMask;
if (compare == static_cast<uint8_t>(vk::CompareOp::eAlways) ||
compare == static_cast<uint8_t>(vk::CompareOp::eNever)) {
required_bits = 0;
}
std::array<vk::StencilOp, 3> converted {};
for (size_t i = 0; i < operations.size(); i++) {
converted[i] = ConvertStencilOp(operations[i], dynamic.writeMask, op_value);
if (converted[i] != vk::StencilOp::eReplace) {
continue;
}
auto replacement = test_value;
if (static_cast<Prospero::StencilOp>(operations[i]) == Prospero::StencilOp::kReplaceOp) {
replacement = op_value;
}
if (((reference ^ replacement) & required_bits & dynamic.writeMask) != 0) {
DepthFatal("unsupported stencil replacement: compare=%u, compare mask=0x%02" PRIx32
", write mask=0x%02" PRIx32 ", operation value=0x%02" PRIx8
", test value=0x%02" PRIx32,
compare, dynamic.compareMask, dynamic.writeMask, op_value, test_value);
}
// Vulkan shares one reference between comparison and every replacement on this face.
reference = (reference & ~dynamic.writeMask) | (replacement & dynamic.writeMask);
required_bits |= dynamic.writeMask;
}
dynamic.reference = reference;
return {converted[0], converted[1], converted[2], static_cast<vk::CompareOp>(compare)};
}
[[nodiscard]] static vk::Format ResolveHostDepthAttachmentFormat(const CommandBuffer& buffer,