diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-03 05:47:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-03 05:47:11 +0200 |
commit | ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134 (patch) | |
tree | ccd1711253e0bf2e10e62df4b72afb345a605ce5 | |
parent | Merge pull request #610 from Subv/mufu_8 (diff) | |
parent | GPU: Use only the least significant 3 bits when reading the depth test func. (diff) | |
download | yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar.gz yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar.bz2 yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar.lz yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar.xz yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.tar.zst yuzu-ddb767f1b6b5643a08b8f51d4f3d7f8cb83aa134.zip |
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 18 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index ff67f2a58..12aec3549 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -281,14 +281,14 @@ public: }; enum class ComparisonOp : u32 { - Never = 0x200, - Less = 0x201, - Equal = 0x202, - LessEqual = 0x203, - Greater = 0x204, - NotEqual = 0x205, - GreaterEqual = 0x206, - Always = 0x207, + Never = 0, + Less = 1, + Equal = 2, + LessEqual = 3, + Greater = 4, + NotEqual = 5, + GreaterEqual = 6, + Always = 7, }; struct Cull { @@ -475,7 +475,7 @@ public: INSERT_PADDING_WORDS(0x8); - ComparisonOp depth_test_func; + BitField<0, 3, ComparisonOp> depth_test_func; INSERT_PADDING_WORDS(0xB); diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index ca3814cfc..1ced31e84 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -735,6 +735,10 @@ void RasterizerOpenGL::SyncDepthTestState() { state.depth.test_enabled = regs.depth_test_enable != 0; state.depth.write_mask = regs.depth_write_enabled ? GL_TRUE : GL_FALSE; + + if (!state.depth.test_enabled) + return; + state.depth.test_func = MaxwellToGL::ComparisonOp(regs.depth_test_func); } |