From c6611dffa7ba7aef5868b29bcac6ec1d79b7184b Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 21 Nov 2022 19:35:21 +0100 Subject: [PATCH] Revert "[dxbc] Move shex check to constructor" Breaks stuff for unknown reasons. --- src/dxbc/dxbc_module.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dxbc/dxbc_module.cpp b/src/dxbc/dxbc_module.cpp index 53293e4a..d406bf29 100644 --- a/src/dxbc/dxbc_module.cpp +++ b/src/dxbc/dxbc_module.cpp @@ -32,9 +32,6 @@ namespace dxvk { if ((tag == "PCSG") || (tag == "PSG1")) m_psgnChunk = new DxbcIsgn(chunkReader, tag); } - - if (m_shexChunk == nullptr) - throw DxvkError("DxbcModule::compile: No SHDR/SHEX chunk"); } @@ -46,6 +43,8 @@ namespace dxvk { Rc DxbcModule::compile( const DxbcModuleInfo& moduleInfo, const std::string& fileName) const { + if (m_shexChunk == nullptr) + throw DxvkError("DxbcModule::compile: No SHDR/SHEX chunk"); DxbcAnalysisInfo analysisInfo; @@ -71,6 +70,9 @@ namespace dxvk { Rc DxbcModule::compilePassthroughShader( const DxbcModuleInfo& moduleInfo, const std::string& fileName) const { + if (m_shexChunk == nullptr) + throw DxvkError("DxbcModule::compile: No SHDR/SHEX chunk"); + DxbcAnalysisInfo analysisInfo; DxbcCompiler compiler(