From 8f0895e0f8257da2fd10b6325931627a9a1792ba Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 11 Nov 2020 09:56:50 -0500 Subject: Include hierarchy output (#1595) * #include an absolute path didn't work - because paths were taken to always be relative. * Improve diagnostic for token pasting. * Token paste location test. * Output include hierarchy. * WIP on includes hierarchy. * Improved include hierarchy output - to handle source files without tokens. Improved test case. * Small comment improvements. Fixed a typo with not returning a reference. * Slight simplification of the ViewInitiatingHierarchy, by adding GetOrAddValue to Dictionary. * Remove the need for ViewInitiatingHierarchy type. * Improve output of path in diagnostic for includes hierarchy. * Remove comment in diagnostic for token-paste-location.slang * Update command line docs to include `-output-includes` Co-authored-by: Yong He --- docs/command-line-slangc.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/command-line-slangc.md b/docs/command-line-slangc.md index 233656057..01c5f7312 100644 --- a/docs/command-line-slangc.md +++ b/docs/command-line-slangc.md @@ -122,7 +122,7 @@ For completeness, here are the options that `slangc` currently accepts: * `dxil-assembly` / `dxil-asm`: DirectX Intermediate Language assembly * `-profile `: Specify the "profile" to use for the code generation target, which represents an abstact feature level as defined by a particular API standard. Available values include: - * The Direct3D "Shader Model" levels are available as `sm_{4_0,4_1,5_0,5_1,6_0,6_1,6_2,6_3}` + * The Direct3D "Shader Model" levels are available as `sm_{4_0,4_1,5_0,5_1,6_0,6_1,6_2,6_3,6_4,6_5,6_6}` * Profiles corresponding to GLSL langauge versions are available as `glsl_{110,120,130,140,150,330,400,410,420,430,440,450,460}` * As a convenience, names matching traditional HLSL shader profiles are provided such that, e.g., `-profile vs_5_0` is an abbreviation for `-profile sm_5_0 -stage vertex` @@ -147,6 +147,8 @@ For completeness, here are the options that `slangc` currently accepts: * `--`: Stop parsing options, and treat the rest of the command line as input paths +* `-output-includes`: After pre-processing has been performed will output to via the diagnostics the hierarchy of paths to source files reached + ### Specifying where dlls/shared libraries are loaded from On windows if you want a dll loaded from a specific path, the path must be specified absolutely. See the *'LoadLibrary'* documentation for more details. A relative path will cause Windows to check all locations along it's search procedure. -- cgit v1.2.3