From 064c28f58e845be67a31283cb885b22f32118f49 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Sun, 9 Jul 2017 18:08:22 -0700 Subject: Pick layout rules based on target languge, not source. The tricky bit here was that the `reflection-json` output format isn't really a code generation target like the others, and we need to be able to have multiple "targets" active to make sense of it. This needs cleaning-up. --- source/slang/type-layout.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source/slang/type-layout.cpp') diff --git a/source/slang/type-layout.cpp b/source/slang/type-layout.cpp index 10c7327ce..31c8ed607 100644 --- a/source/slang/type-layout.cpp +++ b/source/slang/type-layout.cpp @@ -543,15 +543,18 @@ LayoutRulesFamilyImpl* GetLayoutRulesFamilyImpl(LayoutRulesFamily rule) } } -LayoutRulesFamilyImpl* GetLayoutRulesFamilyImpl(SourceLanguage language) +LayoutRulesFamilyImpl* GetLayoutRulesFamilyImpl(CodeGenTarget target) { - switch (language) + switch (target) { - case SourceLanguage::Slang: - case SourceLanguage::HLSL: + case CodeGenTarget::HLSL: + case CodeGenTarget::DXBytecode: + case CodeGenTarget::DXBytecodeAssembly: return &kHLSLLayoutRulesFamilyImpl; - case SourceLanguage::GLSL: + case CodeGenTarget::GLSL: + case CodeGenTarget::SPIRV: + case CodeGenTarget::SPIRVAssembly: return &kGLSLLayoutRulesFamilyImpl; default: -- cgit v1.2.3