From e4e1cc11b8f7649171fe922b2899e57120bfba53 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Sun, 21 Mar 2021 19:28:37 -0400
Subject: shader: Implement DMNMX, DSET, DSETP

---
 src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp  |  1 +
 src/shader_recompiler/ir_opt/constant_propagation_pass.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/shader_recompiler/ir_opt')

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 e9f64cf3f..f44eac5d8 100644
--- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
+++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
@@ -130,6 +130,7 @@ void VisitUsages(Info& info, IR::Inst& inst) {
     case IR::Opcode::CompositeInsertF64x2:
     case IR::Opcode::CompositeInsertF64x3:
     case IR::Opcode::CompositeInsertF64x4:
+    case IR::Opcode::SelectF64:
     case IR::Opcode::BitCastU64F64:
     case IR::Opcode::BitCastF64U64:
     case IR::Opcode::PackDouble2x32:
diff --git a/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp b/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
index a39db2bf1..ef7766d22 100644
--- a/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
+++ b/src/shader_recompiler/ir_opt/constant_propagation_pass.cpp
@@ -229,7 +229,6 @@ void FoldISub32(IR::Inst& inst) {
     }
 }
 
-template <typename T>
 void FoldSelect(IR::Inst& inst) {
     const IR::Value cond{inst.Arg(0)};
     if (cond.IsImmediate()) {
@@ -340,8 +339,15 @@ void ConstantPropagation(IR::Block& block, IR::Inst& inst) {
         return FoldBitCast<IR::Opcode::BitCastU32F32, u32, f32>(inst, IR::Opcode::BitCastF32U32);
     case IR::Opcode::IAdd64:
         return FoldAdd<u64>(block, inst);
+    case IR::Opcode::SelectU1:
+    case IR::Opcode::SelectU8:
+    case IR::Opcode::SelectU16:
     case IR::Opcode::SelectU32:
-        return FoldSelect<u32>(inst);
+    case IR::Opcode::SelectU64:
+    case IR::Opcode::SelectF16:
+    case IR::Opcode::SelectF32:
+    case IR::Opcode::SelectF64:
+        return FoldSelect(inst);
     case IR::Opcode::LogicalAnd:
         return FoldLogicalAnd(inst);
     case IR::Opcode::LogicalOr:
-- 
cgit v1.2.3