N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup

Browse source
This commit is contained in:
Subv 2015-12-04 13:46:28 -05:00
parent 3ec4a6d856
commit 5e6b72bea9
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/video_core/rasterizer.cpp
View file

@ -393,10 +393,10 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
for (u16 x = min_x + 8; x < max_x; x += 0x10) { for (u16 x = min_x + 8; x < max_x; x += 0x10) {
// Do not process the pixel if it's inside the scissor box and the scissor mode is set to Exclude // Do not process the pixel if it's inside the scissor box and the scissor mode is set to Exclude
if (regs.scissor_test.mode == Regs::ScissorMode::Exclude) { if (regs.scissor_test.mode == Regs::ScissorMode::Exclude &&
if (x >= scissor_x && x <= scissor_x + scissor_width && x >= scissor_x && x <= scissor_x + scissor_width &&
y >= scissor_y && y <= scissor_y + scissor_height) y >= scissor_y && y <= scissor_y + scissor_height) {
continue; continue;
} }
// Calculate the barycentric coordinates w0, w1 and w2 // Calculate the barycentric coordinates w0, w1 and w2

12
src/video_core/renderer_opengl/gl_shader_gen.cpp
View file

@ -346,6 +346,12 @@ uniform sampler2D tex[3];
void main() { void main() {
)"; )";
// Do not do any sort of processing if it's obvious we're not going to pass the alpha test
if (config.alpha_test_func == Regs::CompareFunc::Never) {
out += "discard; }";
return out;
}
// Append the scissor test // Append the scissor test
if (config.scissor_test_mode == Regs::ScissorMode::Include || config.scissor_test_mode == Regs::ScissorMode::Exclude) { if (config.scissor_test_mode == Regs::ScissorMode::Include || config.scissor_test_mode == Regs::ScissorMode::Exclude) {
out += "if (scissor_left <= scissor_right || scissor_top >= scissor_bottom) discard;\n"; out += "if (scissor_left <= scissor_right || scissor_top >= scissor_bottom) discard;\n";
@ -356,12 +362,6 @@ void main() {
out += "(gl_FragCoord.x >= scissor_right && gl_FragCoord.x <= scissor_left && gl_FragCoord.y >= scissor_top && gl_FragCoord.y <= scissor_bottom)) discard;\n"; out += "(gl_FragCoord.x >= scissor_right && gl_FragCoord.x <= scissor_left && gl_FragCoord.y >= scissor_top && gl_FragCoord.y <= scissor_bottom)) discard;\n";
} }
// Do not do any sort of processing if it's obvious we're not going to pass the alpha test
if (config.alpha_test_func == Regs::CompareFunc::Never) {
out += "discard; }";
return out;
}
out += "vec4 combiner_buffer = vec4(0.0);\n"; out += "vec4 combiner_buffer = vec4(0.0);\n";
out += "vec4 next_combiner_buffer = tev_combiner_buffer_color;\n"; out += "vec4 next_combiner_buffer = tev_combiner_buffer_color;\n";
out += "vec4 last_tex_env_out = vec4(0.0);\n"; out += "vec4 last_tex_env_out = vec4(0.0);\n";