citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Rasterizer: Respect buffer-write allow registers

This commit is contained in:
Jannik Vogel 2016-04-01 15:44:42 +02:00
parent d47605b2ed
commit fa24df7340
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/pica.h
View File

@ -578,7 +578,17 @@ struct Regs {
} }
struct { struct {
INSERT_PADDING_WORDS(0x6); INSERT_PADDING_WORDS(0x3);
union {
BitField<0, 4, u32> allow_color_write; // 0 = disable, else enable
};
INSERT_PADDING_WORDS(0x1);
union {
BitField<0, 2, u32> allow_depth_stencil_write; // 0 = disable, else enable
};
DepthFormat depth_format; // TODO: Should be a BitField! DepthFormat depth_format; // TODO: Should be a BitField!
BitField<16, 3, ColorFormat> color_format; BitField<16, 3, ColorFormat> color_format;

4
src/video_core/rasterizer.cpp
View File

@ -809,6 +809,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
auto UpdateStencil = [stencil_test, x, y, &old_stencil](Pica::Regs::StencilAction action) { auto UpdateStencil = [stencil_test, x, y, &old_stencil](Pica::Regs::StencilAction action) {
u8 new_stencil = PerformStencilAction(action, old_stencil, stencil_test.reference_value); u8 new_stencil = PerformStencilAction(action, old_stencil, stencil_test.reference_value);
if (g_state.regs.framebuffer.allow_depth_stencil_write != 0)
SetStencil(x >> 4, y >> 4, (new_stencil & stencil_test.write_mask) | (old_stencil & ~stencil_test.write_mask)); SetStencil(x >> 4, y >> 4, (new_stencil & stencil_test.write_mask) | (old_stencil & ~stencil_test.write_mask));
}; };
@ -909,7 +910,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
} }
} }
if (output_merger.depth_write_enable) if (regs.framebuffer.allow_depth_stencil_write != 0 && output_merger.depth_write_enable)
SetDepth(x >> 4, y >> 4, z); SetDepth(x >> 4, y >> 4, z);
// The stencil depth_pass action is executed even if depth testing is disabled // The stencil depth_pass action is executed even if depth testing is disabled
@ -1133,6 +1134,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
output_merger.alpha_enable ? blend_output.a() : dest.a() output_merger.alpha_enable ? blend_output.a() : dest.a()
}; };
if (regs.framebuffer.allow_color_write != 0)
DrawPixel(x >> 4, y >> 4, result); DrawPixel(x >> 4, y >> 4, result);
} }
} }