From 858c7c57b125afed9b5b2329d6b02477284e4803 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 17 Aug 2021 09:39:02 -0700 Subject: Add GLSL450 intrinsics to SPIRV direct emit. (#1921) * Add GLSL450 intrinsics to SPIRV direct emit. * Fix. * Fix compiler error. * Fix. * Fix compiler error. * Make direct-spirv tests actually run. --- source/slang/slang.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 913be346e..ef6872e76 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -1100,12 +1100,6 @@ void TargetRequest::addCapability(CapabilityAtom capability) cookedCapabilities = CapabilitySet::makeEmpty(); } -void TargetRequest::setDirectSPIRVEmitMode() -{ - m_emitSPIRVDirectly = true; - cookedCapabilities.makeEmpty(); -} - CapabilitySet TargetRequest::getTargetCaps() { if(!cookedCapabilities.isEmpty()) @@ -1140,7 +1134,7 @@ CapabilitySet TargetRequest::getTargetCaps() break; case CodeGenTarget::SPIRV: case CodeGenTarget::SPIRVAssembly: - if (m_emitSPIRVDirectly) + if (targetFlags & SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY) { atoms.add(CapabilityAtom::SPIRV_DIRECT); } -- cgit v1.2.3