From 14bd73db360c0cec61dd2e211dcde49b2197e425 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 9 Jun 2021 01:16:25 -0400
Subject: [PATCH] glsl: Enable early fragment tests

---
 src/shader_recompiler/backend/glsl/emit_context.cpp       | 3 +++
 .../backend/glsl/emit_glsl_floating_point.cpp             | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp
index e0d678554..a24fa46c5 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_context.cpp
@@ -266,6 +266,9 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile
     case Stage::Fragment:
         stage_name = "fs";
         position_name = "gl_FragCoord";
+        if (runtime_info.force_early_z) {
+            header += "layout(early_fragment_tests)in;";
+        }
         break;
     case Stage::Compute:
         stage_name = "cs";
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
index adeafdd3d..fbf66015f 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
@@ -47,17 +47,17 @@ void EmitFPAdd16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& i
 
 void EmitFPAdd32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     if (Precise(inst)) {
-        ctx.AddPrecF32("{}=float({})+float({});", inst, a, b);
+        ctx.AddPrecF32("{}={}+{};", inst, a, b);
     } else {
-        ctx.AddF32("{}=float({})+float({});", inst, a, b);
+        ctx.AddF32("{}={}+{};", inst, a, b);
     }
 }
 
 void EmitFPAdd64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     if (Precise(inst)) {
-        ctx.AddPrecF64("{}=double({})+double({});", inst, a, b);
+        ctx.AddPrecF64("{}={}+{};", inst, a, b);
     } else {
-        ctx.AddF64("{}=double({})+double({});", inst, a, b);
+        ctx.AddF64("{}={}+{};", inst, a, b);
     }
 }