diff options
author | bunnei <bunneidev@gmail.com> | 2018-11-28 23:47:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-28 23:47:28 +0100 |
commit | 5a9a84994a31ab72d2caab752ee2a3d02afc8133 (patch) | |
tree | 7e832b967ca67d9b3d349b1818c718f3731bfce1 /src/video_core/renderer_opengl | |
parent | Merge pull request #1786 from Tinob/DepthClamp (diff) | |
parent | remove viewport_transform_enabled as it seems to be inactive when valid transforms are used. (diff) | |
download | yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar.gz yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar.bz2 yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar.lz yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar.xz yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.tar.zst yuzu-5a9a84994a31ab72d2caab752ee2a3d02afc8133.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 28 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 2 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 5c8fe002b..a44bbfae8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -642,6 +642,7 @@ void RasterizerOpenGL::DrawArrays() { SyncCullMode(); SyncPrimitiveRestart(); SyncScissorTest(state); + SyncClipEnabled(); // Alpha Testing is synced on shaders. SyncTransformFeedback(); SyncPointState(); @@ -1006,18 +1007,11 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) { for (std::size_t i = 0; i < viewport_count; i++) { auto& viewport = current_state.viewports[i]; const auto& src = regs.viewports[i]; - if (regs.viewport_transform_enabled) { - const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[i].GetRect()}; - viewport.x = viewport_rect.left; - viewport.y = viewport_rect.bottom; - viewport.width = viewport_rect.GetWidth(); - viewport.height = viewport_rect.GetHeight(); - } else { - viewport.x = src.x; - viewport.y = src.y; - viewport.width = src.width; - viewport.height = src.height; - } + const MathUtil::Rectangle<s32> viewport_rect{regs.viewport_transform[i].GetRect()}; + viewport.x = viewport_rect.left; + viewport.y = viewport_rect.bottom; + viewport.width = viewport_rect.GetWidth(); + viewport.height = viewport_rect.GetHeight(); viewport.depth_range_far = regs.viewports[i].depth_range_far; viewport.depth_range_near = regs.viewports[i].depth_range_near; } @@ -1026,7 +1020,15 @@ void RasterizerOpenGL::SyncViewport(OpenGLState& current_state) { } void RasterizerOpenGL::SyncClipEnabled() { - UNREACHABLE(); + const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; + state.clip_distance[0] = regs.clip_distance_enabled.c0 != 0; + state.clip_distance[1] = regs.clip_distance_enabled.c1 != 0; + state.clip_distance[2] = regs.clip_distance_enabled.c2 != 0; + state.clip_distance[3] = regs.clip_distance_enabled.c3 != 0; + state.clip_distance[4] = regs.clip_distance_enabled.c4 != 0; + state.clip_distance[5] = regs.clip_distance_enabled.c5 != 0; + state.clip_distance[6] = regs.clip_distance_enabled.c6 != 0; + state.clip_distance[7] = regs.clip_distance_enabled.c7 != 0; } void RasterizerOpenGL::SyncClipCoef() { diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index a486d1654..439bfbc98 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -190,7 +190,7 @@ public: GLfloat clamp; } polygon_offset; - std::array<bool, 2> clip_distance; // GL_CLIP_DISTANCE + std::array<bool, 8> clip_distance; // GL_CLIP_DISTANCE OpenGLState(); |