diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-30 06:08:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-30 06:08:32 +0200 |
commit | 4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a (patch) | |
tree | f8a9a0ec07221758b50b952ba58ab0ea28b459a2 /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Merge pull request #2100 from wwylele/fix-load-assert (diff) | |
parent | OpenGL: Take cached viewport sub-rect into account for scissor (diff) | |
download | yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar.gz yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar.bz2 yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar.lz yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar.xz yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.tar.zst yuzu-4b14e17b18e20f7f8077f0c7efc0e3a44ca8ca2a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 60c9d9180..62c9af28c 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -211,6 +211,27 @@ void RasterizerOpenGL::DrawTriangles() { uniform_block_data.dirty = true; } + // Scissor checks are window-, not viewport-relative, which means that if the cached texture + // sub-rect changes, the scissor bounds also need to be updated. + GLint scissor_x1 = rect.left + regs.scissor_test.x1 * color_surface->res_scale_width; + GLint scissor_y1 = rect.bottom + regs.scissor_test.y1 * color_surface->res_scale_height; + // x2, y2 have +1 added to cover the entire pixel area, otherwise you might get cracks when + // scaling or doing multisampling. + GLint scissor_x2 = rect.left + (regs.scissor_test.x2 + 1) * color_surface->res_scale_width; + GLint scissor_y2 = rect.bottom + (regs.scissor_test.y2 + 1) * color_surface->res_scale_height; + + if (uniform_block_data.data.scissor_x1 != scissor_x1 || + uniform_block_data.data.scissor_x2 != scissor_x2 || + uniform_block_data.data.scissor_y1 != scissor_y1 || + uniform_block_data.data.scissor_y2 != scissor_y2) { + + uniform_block_data.data.scissor_x1 = scissor_x1; + uniform_block_data.data.scissor_x2 = scissor_x2; + uniform_block_data.data.scissor_y1 = scissor_y1; + uniform_block_data.data.scissor_y2 = scissor_y2; + uniform_block_data.dirty = true; + } + // Sync and bind the texture surfaces const auto pica_textures = regs.GetTextures(); for (unsigned texture_index = 0; texture_index < pica_textures.size(); ++texture_index) { @@ -374,10 +395,6 @@ void RasterizerOpenGL::NotifyPicaRegisterChanged(u32 id) { case PICA_REG_INDEX(scissor_test.mode): shader_dirty = true; break; - case PICA_REG_INDEX(scissor_test.x1): // and y1 - case PICA_REG_INDEX(scissor_test.x2): // and y2 - SyncScissorTest(); - break; // Logic op case PICA_REG_INDEX(output_merger.logic_op): @@ -1061,7 +1078,6 @@ void RasterizerOpenGL::SetShader() { SyncDepthOffset(); SyncAlphaTest(); SyncCombinerColor(); - SyncScissorTest(); auto& tev_stages = Pica::g_state.regs.GetTevStages(); for (int index = 0; index < tev_stages.size(); ++index) SyncTevConstColor(index, tev_stages[index]); @@ -1236,22 +1252,6 @@ void RasterizerOpenGL::SyncDepthTest() { : GL_ALWAYS; } -void RasterizerOpenGL::SyncScissorTest() { - const auto& regs = Pica::g_state.regs; - - if (uniform_block_data.data.scissor_x1 != regs.scissor_test.x1 || - uniform_block_data.data.scissor_y1 != regs.scissor_test.y1 || - uniform_block_data.data.scissor_x2 != regs.scissor_test.x2 || - uniform_block_data.data.scissor_y2 != regs.scissor_test.y2) { - - uniform_block_data.data.scissor_x1 = regs.scissor_test.x1; - uniform_block_data.data.scissor_y1 = regs.scissor_test.y1; - uniform_block_data.data.scissor_x2 = regs.scissor_test.x2; - uniform_block_data.data.scissor_y2 = regs.scissor_test.y2; - uniform_block_data.dirty = true; - } -} - void RasterizerOpenGL::SyncCombinerColor() { auto combiner_color = PicaToGL::ColorRGBA8(Pica::g_state.regs.tev_combiner_buffer_color.raw); if (combiner_color != uniform_block_data.data.tev_combiner_buffer_color) { |