3 files changed, 185 insertions, 242 deletions

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 e8c828e7c..665fc1562 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
@@ -10,162 +10,151 @@
 #include "shader_recompiler/profile.h"
 
 namespace Shader::Backend::GLSL {
+namespace {
+void Compare(EmitContext& ctx, IR::Inst& inst, std::string_view lhs, std::string_view rhs,
+             std::string_view op, std::string_view, bool ordered, bool inequality = false) {
+    ctx.AddU1("{}={}{}{}", inst, lhs, op, rhs, lhs, rhs);
+    if (ordered && inequality) {
+        ctx.code += fmt::format("&&!isnan({})&&!isnan({})", lhs, rhs);
+    } else if (!ordered && !inequality) {
+        ctx.code += fmt::format("||!isnan({})||!isnan({})", lhs, rhs);
+    }
+    ctx.code += ";";
+}
+} // namespace
 
 void EmitFPAbs16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                  [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPAbs32([[maybe_unused]] EmitContext& ctx, IR::Inst& inst,
-                 [[maybe_unused]] std::string_view value) {
+void EmitFPAbs32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=abs({});", inst, value);
 }
 
-void EmitFPAbs64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+void EmitFPAbs64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
+    ctx.AddF64("{}=abs({});", inst, value);
 }
 
 void EmitFPAdd16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                  [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPAdd32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF32("{}=float({})+float({});", inst, a, b);
 }
 
-void EmitFPAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPAdd64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF64("{}=double({})+double({});", inst, a, b);
 }
 
 void EmitFPFma16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                  [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b,
                  [[maybe_unused]] std::string_view c) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPFma32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b,
-                 [[maybe_unused]] std::string_view c) {
+void EmitFPFma32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b,
+                 std::string_view c) {
     ctx.AddF32("{}=fma({},{},{});", inst, a, b, c);
 }
 
-void EmitFPFma64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b,
-                 [[maybe_unused]] std::string_view c) {
+void EmitFPFma64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b,
+                 std::string_view c) {
     ctx.AddF64("{}=fma({},{},{});", inst, a, b, c);
 }
 
-void EmitFPMax32([[maybe_unused]] EmitContext& ctx, IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMax32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF32("{}=max({},{});", inst, a, b);
 }
 
-void EmitFPMax64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMax64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF64("{}=max({},{});", inst, a, b);
 }
 
-void EmitFPMin32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMin32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF32("{}=min({},{});", inst, a, b);
 }
 
-void EmitFPMin64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMin64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF64("{}=min({},{});", inst, a, b);
 }
 
 void EmitFPMul16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                  [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPMul32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMul32(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF32("{}={}*{};", inst, a, b);
 }
 
-void EmitFPMul64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
+void EmitFPMul64(EmitContext& ctx, IR::Inst& inst, std::string_view a, std::string_view b) {
     ctx.AddF64("{}={}*{};", inst, a, b);
 }
 
 void EmitFPNeg16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                  [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPNeg32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view value) {
+void EmitFPNeg32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=-({});", inst, value);
 }
 
-void EmitFPNeg64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                 [[maybe_unused]] std::string_view value) {
+void EmitFPNeg64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=-({});", inst, value);
 }
 
-void EmitFPSin([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-               [[maybe_unused]] std::string_view value) {
+void EmitFPSin(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=sin({});", inst, value);
 }
 
-void EmitFPCos([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-               [[maybe_unused]] std::string_view value) {
+void EmitFPCos(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=cos({});", inst, value);
 }
 
-void EmitFPExp2([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                [[maybe_unused]] std::string_view value) {
+void EmitFPExp2(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=exp2({});", inst, value);
 }
 
-void EmitFPLog2([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                [[maybe_unused]] std::string_view value) {
+void EmitFPLog2(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=log2({});", inst, value);
 }
 
-void EmitFPRecip32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPRecip32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=1/{};", inst, value);
 }
 
-void EmitFPRecip64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPRecip64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=1/{};", inst, value);
 }
 
 void EmitFPRecipSqrt32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                        [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
 void EmitFPRecipSqrt64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                        [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPSqrt([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                [[maybe_unused]] std::string_view value) {
+void EmitFPSqrt(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=sqrt({});", inst, value);
 }
 
 void EmitFPSaturate16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                       [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPSaturate32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                      [[maybe_unused]] std::string_view value) {
+void EmitFPSaturate32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=min(max({},0.0),1.0);", inst, value);
 }
 
-void EmitFPSaturate64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                      [[maybe_unused]] std::string_view value) {
+void EmitFPSaturate64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=min(max({},0.0),1.0);", inst, value);
 }
 
@@ -173,316 +162,269 @@ void EmitFPClamp16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst&
                    [[maybe_unused]] std::string_view value,
                    [[maybe_unused]] std::string_view min_value,
                    [[maybe_unused]] std::string_view max_value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPClamp32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value,
-                   [[maybe_unused]] std::string_view min_value,
-                   [[maybe_unused]] std::string_view max_value) {
+void EmitFPClamp32(EmitContext& ctx, IR::Inst& inst, std::string_view value,
+                   std::string_view min_value, std::string_view max_value) {
     // GLSL's clamp does not produce desirable results
     ctx.AddF32("{}=min(max({},float({})),float({}));", inst, value, min_value, max_value);
 }
 
-void EmitFPClamp64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value,
-                   [[maybe_unused]] std::string_view min_value,
-                   [[maybe_unused]] std::string_view max_value) {
+void EmitFPClamp64(EmitContext& ctx, IR::Inst& inst, std::string_view value,
+                   std::string_view min_value, std::string_view max_value) {
     // GLSL's clamp does not produce desirable results
     ctx.AddF64("{}=min(max({},double({})),double({}));", inst, value, min_value, max_value);
 }
 
 void EmitFPRoundEven16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                        [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPRoundEven32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                       [[maybe_unused]] std::string_view value) {
+void EmitFPRoundEven32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=roundEven({});", inst, value);
 }
 
-void EmitFPRoundEven64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                       [[maybe_unused]] std::string_view value) {
+void EmitFPRoundEven64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=roundEven({});", inst, value);
 }
 
 void EmitFPFloor16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                    [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPFloor32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPFloor32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=floor({});", inst, value);
 }
 
-void EmitFPFloor64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPFloor64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=floor({});", inst, value);
 }
 
 void EmitFPCeil16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                   [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPCeil32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                  [[maybe_unused]] std::string_view value) {
+void EmitFPCeil32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=ceil({});", inst, value);
 }
 
-void EmitFPCeil64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                  [[maybe_unused]] std::string_view value) {
+void EmitFPCeil64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=ceil({});", inst, value);
 }
 
 void EmitFPTrunc16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                    [[maybe_unused]] std::string_view value) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL Instruction");
 }
 
-void EmitFPTrunc32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPTrunc32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF32("{}=trunc({});", inst, value);
 }
 
-void EmitFPTrunc64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPTrunc64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddF64("{}=trunc({});", inst, value);
 }
 
-void EmitFPOrdEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                      [[maybe_unused]] std::string_view lhs,
+void EmitFPOrdEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                       [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                      [[maybe_unused]] std::string_view lhs,
-                      [[maybe_unused]] std::string_view rhs) {
-    ctx.AddU1("{}={}=={};", inst, lhs, rhs);
+void EmitFPOrdEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                      std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "==", "F", true);
 }
 
-void EmitFPOrdEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                      [[maybe_unused]] std::string_view lhs,
-                      [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                      std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "==", "F64", true);
 }
 
-void EmitFPUnordEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                        [[maybe_unused]] std::string_view lhs,
+void EmitFPUnordEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                         [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                        [[maybe_unused]] std::string_view lhs,
-                        [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                        std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "==", "F", false);
 }
 
-void EmitFPUnordEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                        [[maybe_unused]] std::string_view lhs,
-                        [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                        std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "==", "F64", false);
 }
 
-void EmitFPOrdNotEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
+void EmitFPOrdNotEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                          [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdNotEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
-                         [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdNotEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                         std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "!=", "F", true, true);
 }
 
-void EmitFPOrdNotEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
-                         [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdNotEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                         std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "!=", "F64", true, true);
 }
 
-void EmitFPUnordNotEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
+void EmitFPUnordNotEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                            [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordNotEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
-                           [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordNotEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                           std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "!=", "F", false, true);
 }
 
-void EmitFPUnordNotEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
-                           [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordNotEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                           std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "!=", "F64", false, true);
 }
 
-void EmitFPOrdLessThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
+void EmitFPOrdLessThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                          [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdLessThan32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
-                         [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdLessThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                         std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<", "F", true);
 }
 
-void EmitFPOrdLessThan64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                         [[maybe_unused]] std::string_view lhs,
-                         [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdLessThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                         std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<", "F64", true);
 }
 
-void EmitFPUnordLessThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
+void EmitFPUnordLessThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] std::string_view lhs,
                            [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordLessThan32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
-                           [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordLessThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                           std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<", "F", false);
 }
 
-void EmitFPUnordLessThan64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                           [[maybe_unused]] std::string_view lhs,
-                           [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordLessThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                           std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<", "F64", false);
 }
 
-void EmitFPOrdGreaterThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
+void EmitFPOrdGreaterThan16([[maybe_unused]] EmitContext& ctx,
                             [[maybe_unused]] std::string_view lhs,
                             [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdGreaterThan32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                            [[maybe_unused]] std::string_view lhs,
-                            [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdGreaterThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                            std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">", "F", true);
 }
 
-void EmitFPOrdGreaterThan64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                            [[maybe_unused]] std::string_view lhs,
-                            [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdGreaterThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                            std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">", "F64", true);
 }
 
-void EmitFPUnordGreaterThan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
+void EmitFPUnordGreaterThan16([[maybe_unused]] EmitContext& ctx,
                               [[maybe_unused]] std::string_view lhs,
                               [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordGreaterThan32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                              [[maybe_unused]] std::string_view lhs,
-                              [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordGreaterThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                              std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">", "F", false);
 }
 
-void EmitFPUnordGreaterThan64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                              [[maybe_unused]] std::string_view lhs,
-                              [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordGreaterThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                              std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">", "F64", false);
 }
 
-void EmitFPOrdLessThanEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
+void EmitFPOrdLessThanEqual16([[maybe_unused]] EmitContext& ctx,
                               [[maybe_unused]] std::string_view lhs,
                               [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdLessThanEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                              [[maybe_unused]] std::string_view lhs,
-                              [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdLessThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                              std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<=", "F", true);
 }
 
-void EmitFPOrdLessThanEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                              [[maybe_unused]] std::string_view lhs,
-                              [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdLessThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                              std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<=", "F64", true);
 }
 
-void EmitFPUnordLessThanEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
+void EmitFPUnordLessThanEqual16([[maybe_unused]] EmitContext& ctx,
                                 [[maybe_unused]] std::string_view lhs,
                                 [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordLessThanEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                                [[maybe_unused]] std::string_view lhs,
-                                [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordLessThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<=", "F", false);
 }
 
-void EmitFPUnordLessThanEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                                [[maybe_unused]] std::string_view lhs,
-                                [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordLessThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, "<=", "F64", false);
 }
 
-void EmitFPOrdGreaterThanEqual16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
+void EmitFPOrdGreaterThanEqual16([[maybe_unused]] EmitContext& ctx,
                                  [[maybe_unused]] std::string_view lhs,
                                  [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPOrdGreaterThanEqual32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                                 [[maybe_unused]] std::string_view lhs,
-                                 [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdGreaterThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                 std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">=", "F", true);
 }
 
-void EmitFPOrdGreaterThanEqual64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                                 [[maybe_unused]] std::string_view lhs,
-                                 [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPOrdGreaterThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                 std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">=", "F64", true);
 }
 
 void EmitFPUnordGreaterThanEqual16([[maybe_unused]] EmitContext& ctx,
-                                   [[maybe_unused]] IR::Inst& inst,
                                    [[maybe_unused]] std::string_view lhs,
                                    [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPUnordGreaterThanEqual32([[maybe_unused]] EmitContext& ctx,
-                                   [[maybe_unused]] IR::Inst& inst,
-                                   [[maybe_unused]] std::string_view lhs,
-                                   [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordGreaterThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                   std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">=", "F", false);
 }
 
-void EmitFPUnordGreaterThanEqual64([[maybe_unused]] EmitContext& ctx,
-                                   [[maybe_unused]] IR::Inst& inst,
-                                   [[maybe_unused]] std::string_view lhs,
-                                   [[maybe_unused]] std::string_view rhs) {
-    throw NotImplementedException("GLSL");
+void EmitFPUnordGreaterThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
+                                   std::string_view rhs) {
+    Compare(ctx, inst, lhs, rhs, ">=", "F64", false);
 }
 
 void EmitFPIsNan16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
                    [[maybe_unused]] std::string_view value) {
-    ctx.AddU1("{}=isnan({});", inst, value);
+    throw NotImplementedException("GLSL instruction");
 }
 
-void EmitFPIsNan32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPIsNan32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddU1("{}=isnan({});", inst, value);
 }
 
-void EmitFPIsNan64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
-                   [[maybe_unused]] std::string_view value) {
+void EmitFPIsNan64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
     ctx.AddU1("{}=isnan({});", inst, value);
 }
 
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
index efa515a3c..4e0487543 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
@@ -289,71 +289,60 @@ void EmitFPCeil64(EmitContext& ctx, IR::Inst& inst, std::string_view value);
 void EmitFPTrunc16(EmitContext& ctx, IR::Inst& inst, std::string_view value);
 void EmitFPTrunc32(EmitContext& ctx, IR::Inst& inst, std::string_view value);
 void EmitFPTrunc64(EmitContext& ctx, IR::Inst& inst, std::string_view value);
-void EmitFPOrdEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs, std::string_view rhs);
+void EmitFPOrdEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs, std::string_view rhs);
-void EmitFPUnordEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                        std::string_view rhs);
+void EmitFPUnordEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                         std::string_view rhs);
 void EmitFPUnordEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                         std::string_view rhs);
-void EmitFPOrdNotEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                         std::string_view rhs);
+void EmitFPOrdNotEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdNotEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                          std::string_view rhs);
 void EmitFPOrdNotEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                          std::string_view rhs);
-void EmitFPUnordNotEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                           std::string_view rhs);
+void EmitFPUnordNotEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordNotEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                            std::string_view rhs);
 void EmitFPUnordNotEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                            std::string_view rhs);
-void EmitFPOrdLessThan16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                         std::string_view rhs);
+void EmitFPOrdLessThan16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdLessThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                          std::string_view rhs);
 void EmitFPOrdLessThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                          std::string_view rhs);
-void EmitFPUnordLessThan16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                           std::string_view rhs);
+void EmitFPUnordLessThan16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordLessThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                            std::string_view rhs);
 void EmitFPUnordLessThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                            std::string_view rhs);
-void EmitFPOrdGreaterThan16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                            std::string_view rhs);
+void EmitFPOrdGreaterThan16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdGreaterThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                             std::string_view rhs);
 void EmitFPOrdGreaterThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                             std::string_view rhs);
-void EmitFPUnordGreaterThan16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                              std::string_view rhs);
+void EmitFPUnordGreaterThan16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordGreaterThan32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                               std::string_view rhs);
 void EmitFPUnordGreaterThan64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                               std::string_view rhs);
-void EmitFPOrdLessThanEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                              std::string_view rhs);
+void EmitFPOrdLessThanEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdLessThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                               std::string_view rhs);
 void EmitFPOrdLessThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                               std::string_view rhs);
-void EmitFPUnordLessThanEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                                std::string_view rhs);
+void EmitFPUnordLessThanEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordLessThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                                 std::string_view rhs);
 void EmitFPUnordLessThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                                 std::string_view rhs);
-void EmitFPOrdGreaterThanEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                                 std::string_view rhs);
+void EmitFPOrdGreaterThanEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPOrdGreaterThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                                  std::string_view rhs);
 void EmitFPOrdGreaterThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                                  std::string_view rhs);
-void EmitFPUnordGreaterThanEqual16(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
-                                   std::string_view rhs);
+void EmitFPUnordGreaterThanEqual16(EmitContext& ctx, std::string_view lhs, std::string_view rhs);
 void EmitFPUnordGreaterThanEqual32(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
                                    std::string_view rhs);
 void EmitFPUnordGreaterThanEqual64(EmitContext& ctx, IR::Inst& inst, std::string_view lhs,
diff --git a/src/shader_recompiler/backend/glsl/reg_alloc.cpp b/src/shader_recompiler/backend/glsl/reg_alloc.cpp
index 007f8c89d..9f529c358 100644
--- a/src/shader_recompiler/backend/glsl/reg_alloc.cpp
+++ b/src/shader_recompiler/backend/glsl/reg_alloc.cpp
@@ -25,6 +25,18 @@ std::string Representation(Id id) {
 }
 
 std::string FormatFloat(std::string_view value, IR::Type type) {
+    // TODO: Confirm FP64 nan/inf
+    if (type == IR::Type::F32) {
+        if (value == "nan") {
+            return "uintBitsToFloat(0x7fc00000)";
+        }
+        if (value == "inf") {
+            return "uintBitsToFloat(0x7f800000)";
+        }
+        if (value == "-inf") {
+            return "uintBitsToFloat(0xff800000)";
+        }
+    }
     const bool needs_dot = value.find_first_of('.') == std::string_view::npos;
     const bool needs_suffix = !value.ends_with('f');
     const auto suffix = type == IR::Type::F32 ? "f" : "lf";