diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-12-29 01:41:41 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-02-28 21:56:41 +0100 |
commit | 9e74e6988b881c6889074bd2335239eb2e491e91 (patch) | |
tree | 8e6ab83abf58154f89f9b05f06ceb7b2cecd0764 /src/video_core/renderer_opengl | |
parent | video_core: Reintroduce dirty flags infrastructure (diff) | |
download | yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar.gz yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar.bz2 yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar.lz yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar.xz yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.tar.zst yuzu-9e74e6988b881c6889074bd2335239eb2e491e91.zip |
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 3ce2a7124..2fb8ec33b 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -945,10 +945,10 @@ void RasterizerOpenGL::SyncClipCoef() { void RasterizerOpenGL::SyncCullMode() { const auto& regs = system.GPU().Maxwell3D().regs; - oglEnable(GL_CULL_FACE, regs.cull.enabled); - glCullFace(MaxwellToGL::CullFace(regs.cull.cull_face)); + oglEnable(GL_CULL_FACE, regs.cull_test_enabled); + glCullFace(MaxwellToGL::CullFace(regs.cull_face)); - glFrontFace(MaxwellToGL::FrontFace(regs.cull.front_face)); + glFrontFace(MaxwellToGL::FrontFace(regs.front_face)); } void RasterizerOpenGL::SyncPrimitiveRestart() { diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index 7ed505628..4c8db7cc8 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h @@ -401,24 +401,24 @@ inline GLenum StencilOp(Maxwell::StencilOp stencil) { return GL_KEEP; } -inline GLenum FrontFace(Maxwell::Cull::FrontFace front_face) { +inline GLenum FrontFace(Maxwell::FrontFace front_face) { switch (front_face) { - case Maxwell::Cull::FrontFace::ClockWise: + case Maxwell::FrontFace::ClockWise: return GL_CW; - case Maxwell::Cull::FrontFace::CounterClockWise: + case Maxwell::FrontFace::CounterClockWise: return GL_CCW; } LOG_ERROR(Render_OpenGL, "Unimplemented front face cull={}", static_cast<u32>(front_face)); return GL_CCW; } -inline GLenum CullFace(Maxwell::Cull::CullFace cull_face) { +inline GLenum CullFace(Maxwell::CullFace cull_face) { switch (cull_face) { - case Maxwell::Cull::CullFace::Front: + case Maxwell::CullFace::Front: return GL_FRONT; - case Maxwell::Cull::CullFace::Back: + case Maxwell::CullFace::Back: return GL_BACK; - case Maxwell::Cull::CullFace::FrontAndBack: + case Maxwell::CullFace::FrontAndBack: return GL_FRONT_AND_BACK; } LOG_ERROR(Render_OpenGL, "Unimplemented cull face={}", static_cast<u32>(cull_face)); |