From f69d0b91ffad7d9ab827f55a9297b8f6da815cc9 Mon Sep 17 00:00:00 2001
From: FernandoS27 <fsahmkow27@gmail.com>
Date: Sun, 18 Apr 2021 09:07:48 +0200
Subject: [PATCH] shader: Address feedback

---
 src/shader_recompiler/backend/spirv/emit_spirv.cpp           | 2 +-
 .../backend/spirv/emit_spirv_context_get_set.cpp             | 5 +----
 src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp    | 2 +-
 src/shader_recompiler/shader_info.h                          | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index c4d5874cab..5d6fdeb65a 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -341,7 +341,7 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct
     if (!ctx.profile.xfb_varyings.empty()) {
         ctx.AddCapability(spv::Capability::TransformFeedback);
     }
-    if (info.uses_derivates) {
+    if (info.uses_derivatives) {
         ctx.AddCapability(spv::Capability::DerivativeControl);
     }
     // TODO: Track this usage
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
index 1030404c0f..ed57e44a2f 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@@ -404,10 +404,7 @@ Id EmitIsHelperInvocation(EmitContext& ctx) {
 }
 
 Id EmitYDirection(EmitContext& ctx) {
-    if (ctx.profile.y_negate) {
-        return ctx.Constant(ctx.F32[1], -1.0f);
-    }
-    return ctx.Constant(ctx.F32[1], 1.0f);
+    return ctx.Constant(ctx.F32[1], ctx.profile.y_negate ? -1.0f : 1.0f);
 }
 
 Id EmitLoadLocal(EmitContext& ctx, Id word_offset) {
diff --git a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
index 7473e0bc20..0500a5141c 100644
--- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
+++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
@@ -534,7 +534,7 @@ void VisitUsages(Info& info, IR::Inst& inst) {
     case IR::Opcode::DPdyFine:
     case IR::Opcode::DPdxCoarse:
     case IR::Opcode::DPdyCoarse:
-        info.uses_derivates = true;
+        info.uses_derivatives = true;
         break;
     case IR::Opcode::LoadStorageU8:
     case IR::Opcode::LoadStorageS8:
diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 3f22958e86..f808adebab 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -147,7 +147,7 @@ struct Info {
     bool uses_subgroup_vote{};
     bool uses_subgroup_mask{};
     bool uses_fswzadd{};
-    bool uses_derivates{};
+    bool uses_derivatives{};
     bool uses_typeless_image_reads{};
     bool uses_typeless_image_writes{};
     bool uses_shared_increment{};