diff options
author | FernandoS27 <fsahmkow27@gmail.com> | 2018-10-10 15:45:22 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2018-10-22 21:07:31 +0200 |
commit | bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346 (patch) | |
tree | c94b3071fca24eaf4eec9e09a6c8b0255fa89d7b /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
parent | Added Alpha Func (diff) | |
download | yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar.gz yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar.bz2 yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar.lz yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar.xz yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.tar.zst yuzu-bcb5b924fd10183fb8fdbbbbe3ba909f8b9fc346.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 17860d447..e5fc6e8f5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -572,8 +572,8 @@ void RasterizerOpenGL::DrawArrays() { SyncBlendState(); SyncLogicOpState(); SyncCullMode(); - SyncAlphaTest(); SyncScissorTest(); + // Alpha Testing is synced on shaders. SyncTransformFeedback(); SyncPointState(); @@ -886,7 +886,7 @@ void RasterizerOpenGL::SetupAlphaTesting(Shader& shader) { const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; glProgramUniform1ui(shader->GetProgramHandle(), shader->GetAlphaTestingEnableLocation(), - regs.alpha_test_enabled); + regs.alpha_test_enabled); glProgramUniform1f(shader->GetProgramHandle(), shader->GetAlphaTestingRefLocation(), regs.alpha_test_ref); @@ -1026,6 +1026,7 @@ void RasterizerOpenGL::SyncLogicOpState() { state.logic_op.operation = MaxwellToGL::LogicOp(regs.logic_op.operation); } +<<<<<<< HEAD void RasterizerOpenGL::SyncAlphaTest() { const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; @@ -1053,6 +1054,8 @@ void RasterizerOpenGL::SyncScissorTest() { } } +======= +>>>>>>> Remove SyncAlphaTest and clang format void RasterizerOpenGL::SyncTransformFeedback() { const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; |