From 95654c371e1b1c1916751d5dcd0d1f3fbfdc12a0 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Wed, 27 Oct 2021 15:21:09 -0400 Subject: SPIR-V fixes (#1992) * #include an absolute path didn't work - because paths were taken to always be relative. * Use updated slang-binaries that have SPIR-V diagnostics improvements. * Re-enable nv-ray-tracing-motion-blur, because with SPIR-V diagnostic fixes in glslang - there shouldn't be spurious errors from glslang compilation. * If optimization fails use the SPIR-V we have. * Update SPIR-V headers and generated files. Updated documentation. * Update spirv-headers/tools. Revert slang-binaries. * Remove hack around spir-v optimization as no longer needed. disable nv-ray-tracing-motion-blur.slang --- external/spirv-tools-generated/README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'external/spirv-tools-generated/README.md') diff --git a/external/spirv-tools-generated/README.md b/external/spirv-tools-generated/README.md index 84cdef4bb..67e6082f7 100644 --- a/external/spirv-tools-generated/README.md +++ b/external/spirv-tools-generated/README.md @@ -7,6 +7,12 @@ To build spirv-tools we need [cmake](https://cmake.org/download/). On windows we Inside the `external/spirv-tools` directory make a directory `build.vs` which is where we are going to generate all the files. +Make sure that there is a suitable version of spirv-headers in `external/spirv-tools/external`. First delete one if its there, and then from the `external/spirv-tools` directory do. + +``` +git clone https://github.com/KhronosGroup/SPIRV-Headers.git external/spirv-headers +``` + You may need to make sure you have the other dependencies that spirv-tools requires as described on their github main page... https://github.com/KhronosGroup/SPIRV-Tools @@ -14,7 +20,6 @@ https://github.com/KhronosGroup/SPIRV-Tools At the time of writing in `external/spirv-tools` the following were needed ``` -git clone https://github.com/KhronosGroup/SPIRV-Headers.git external/spirv-headers git clone https://github.com/google/effcee.git external/effcee git clone https://github.com/google/re2.git external/re2 ``` @@ -23,4 +28,5 @@ Next run the cmake gui. Set the source path to be `external/spirv-tools` (in the Now go into to the `build.vs` directory and open `spirv-tools.sln` with Visual Studio and compile. This will generate many of the files needed, once regular C++/C compilation has started all of the files should have been created. -Take the files with '.inc' and '.h' extensions from the build.vs directory and copy it into this directory. \ No newline at end of file +Delete all the '.inc' and '.h' files in this directory. +Now copy the files with '.inc' and '.h' extensions from the build.vs directory and copy it into this directory. \ No newline at end of file -- cgit v1.2.3