diff options
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 73a3d31..730db8e 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -4143,10 +4143,24 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args, // Validate options for HLSL if (Opts.HLSL) { - bool SupportedTarget = (T.getArch() == llvm::Triple::dxil || - T.getArch() == llvm::Triple::spirv) && - T.getOS() == llvm::Triple::ShaderModel; - if (!SupportedTarget) + // TODO: Revisit restricting SPIR-V to logical once we've figured out how to + // handle PhysicalStorageBuffer64 memory model + if (T.isDXIL() || T.isSPIRVLogical()) { + enum { ShaderModel, ShaderStage }; + if (T.getOSName().empty()) { + Diags.Report(diag::err_drv_hlsl_bad_shader_required_in_target) + << ShaderModel << T.str(); + } else if (!T.isShaderModelOS() || T.getOSVersion() == VersionTuple(0)) { + Diags.Report(diag::err_drv_hlsl_bad_shader_unsupported) + << ShaderModel << T.getOSName() << T.str(); + } else if (T.getEnvironmentName().empty()) { + Diags.Report(diag::err_drv_hlsl_bad_shader_required_in_target) + << ShaderStage << T.str(); + } else if (!T.isShaderStageEnvironment()) { + Diags.Report(diag::err_drv_hlsl_bad_shader_unsupported) + << ShaderStage << T.getEnvironmentName() << T.str(); + } + } else Diags.Report(diag::err_drv_hlsl_unsupported_target) << T.str(); } |