From aa76bae32af6b3937e0220d5c7f304edef886004 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 31 May 2018 14:20:12 +0200
Subject: [PATCH] [dxbc] Fix incorrect OpSelectionMerge instruction

Fixes a regression introduced in v0.53 that would cause
Witcher 3 to crash when enabling Nvidia Hairworks on RADV.
---
 src/dxbc/dxbc_compiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp
index afcc55a9e..848007b79 100644
--- a/src/dxbc/dxbc_compiler.cpp
+++ b/src/dxbc/dxbc_compiler.cpp
@@ -3670,7 +3670,7 @@ namespace dxvk {
       cond.labelIf  = m_module.allocateId();
       cond.labelEnd = m_module.allocateId();
       
-      m_module.opSelectionMerge(cond.labelIf, spv::SelectionControlMaskNone);
+      m_module.opSelectionMerge(cond.labelEnd, spv::SelectionControlMaskNone);
       m_module.opBranchConditional(zeroTest.id, cond.labelIf, cond.labelEnd);
       
       // OpKill terminates the block