Remove SyncAlphaTest and clang format

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();
 
@@ -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;
 

src/video_core/renderer_opengl/gl_rasterizer.h

@@ -132,6 +132,7 @@ private:
     u32 SetupTextures(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, Shader& shader,
                       GLenum primitive_mode, u32 current_unit);
 
+    /// Syncs the alpha test state to match the guest state
     void SetupAlphaTesting(Shader& shader);
 
     /// Syncs the viewport to match the guest state
@@ -164,9 +165,6 @@ private:
     /// Syncs the LogicOp state to match the guest state
     void SyncLogicOpState();
 
-    /// Syncs the alpha test state to match the guest state
-    void SyncAlphaTest();
-
     /// Syncs the scissor test state to match the guest state
     void SyncScissorTest();
 

src/video_core/renderer_opengl/gl_shader_cache.h

@@ -73,7 +73,6 @@ public:
     /// Gets the GL uniform location for the specified resource, caching as needed
     GLint GetUniformLocation(const GLShader::SamplerEntry& sampler);
 
-
     GLint GetAlphaTestingEnableLocation();
     GLint GetAlphaTestingFuncLocation();
     GLint GetAlphaTestingRefLocation();

src/video_core/renderer_opengl/gl_shader_decompiler.cpp

@@ -1280,7 +1280,8 @@ private:
                 header.ps.IsColorComponentOutputEnabled(render_target, 1) ||
                 header.ps.IsColorComponentOutputEnabled(render_target, 2) ||
                 header.ps.IsColorComponentOutputEnabled(render_target, 3)) {
-                shader.AddLine(fmt::format("if (AlphaFunc({}, alpha_testing_ref, alpha_testing_func)) discard;",
+                shader.AddLine(fmt::format(
+                    "if (AlphaFunc({}, alpha_testing_ref, alpha_testing_func)) discard;",
                     regs.GetRegisterAsFloat(current_reg)));
                 current_reg += 4;
             }