diff options
Diffstat (limited to 'source/slang/type-layout.cpp')
| -rw-r--r-- | source/slang/type-layout.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp index 41476a7e5..4e9a05b53 100644 --- a/source/slang/type-layout.cpp +++ b/source/slang/type-layout.cpp @@ -823,7 +823,7 @@ static bool isOpenGLTarget(TargetRequest*) return false; } -static bool isD3DTarget(TargetRequest* targetReq) +bool isD3DTarget(TargetRequest* targetReq) { switch( targetReq->target ) { @@ -839,6 +839,20 @@ static bool isD3DTarget(TargetRequest* targetReq) } } +bool isKhronosTarget(TargetRequest* targetReq) +{ + switch( targetReq->target ) + { + default: + return false; + + case CodeGenTarget::GLSL: + case CodeGenTarget::SPIRV: + case CodeGenTarget::SPIRVAssembly: + return true; + } +} + static bool isD3D11Target(TargetRequest*) { // We aren't officially supporting D3D11 right now @@ -886,21 +900,9 @@ static bool isSM5_1OrLater(TargetRequest* targetReq) static bool isVulkanTarget(TargetRequest* targetReq) { - switch( targetReq->target ) - { - default: - return false; - - case CodeGenTarget::GLSL: - case CodeGenTarget::SPIRV: - case CodeGenTarget::SPIRVAssembly: - break; - } - - // For right now, any GLSL-related target is assumed + // For right now, any Khronos-related target is assumed // to be a Vulkan target. - - return true; + return isKhronosTarget(targetReq); } static bool shouldAllocateRegisterSpaceForParameterBlock( |