From 8011a40843c5dbdc62c4d65bff27c5f6337fcf97 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Tue, 10 Jan 2023 20:35:51 +0100 Subject: [PATCH] Revert "[dxbc] Handle dead code in shader binaries" Apparently this regressed something, but the reporter who asked for this fix in the first place did not specify what, so let's just revert this and break the whole thing again until we get something to actually work with. This reverts commit 5115d80d5179d0158fae270616ef764dacc464c9. --- src/dxbc/dxbc_compiler.cpp | 11 ----------- src/dxbc/dxbc_compiler.h | 1 - 2 files changed, 12 deletions(-) diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp index fb107da63..ea14d6202 100644 --- a/src/dxbc/dxbc_compiler.cpp +++ b/src/dxbc/dxbc_compiler.cpp @@ -72,17 +72,6 @@ namespace dxvk { m_lastOp = m_currOp; m_currOp = ins.op; - if (!m_insideFunction - && ins.opClass != DxbcInstClass::CustomData - && ins.opClass != DxbcInstClass::Declaration - && ins.opClass != DxbcInstClass::HullShaderPhase - && ins.opClass != DxbcInstClass::NoOperation - && ins.op != DxbcOpcode::Label) { - if (!std::exchange(m_hasDeadCode, true)) - Logger::warn("DxbcCompiler: Dead code detected"); - return; - } - switch (ins.opClass) { case DxbcInstClass::Declaration: return this->emitDcl(ins); diff --git a/src/dxbc/dxbc_compiler.h b/src/dxbc/dxbc_compiler.h index dbeec88f4..4720066cb 100644 --- a/src/dxbc/dxbc_compiler.h +++ b/src/dxbc/dxbc_compiler.h @@ -531,7 +531,6 @@ namespace dxvk { ////////////////////// // Global state stuff bool m_precise = true; - bool m_hasDeadCode = false; DxbcOpcode m_lastOp = DxbcOpcode::Nop; DxbcOpcode m_currOp = DxbcOpcode::Nop;