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 --- .../NonSemanticVulkanDebugInfo100.h | 151 --------------------- 1 file changed, 151 deletions(-) delete mode 100644 external/spirv-tools-generated/NonSemanticVulkanDebugInfo100.h (limited to 'external/spirv-tools-generated/NonSemanticVulkanDebugInfo100.h') diff --git a/external/spirv-tools-generated/NonSemanticVulkanDebugInfo100.h b/external/spirv-tools-generated/NonSemanticVulkanDebugInfo100.h deleted file mode 100644 index f6ff926ef..000000000 --- a/external/spirv-tools-generated/NonSemanticVulkanDebugInfo100.h +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright (c) 2018 The Khronos Group Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and/or associated documentation files (the "Materials"), -// to deal in the Materials without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Materials, and to permit persons to whom the -// Materials are furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Materials. -// -// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS -// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND -// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ -// -// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS -// IN THE MATERIALS. - -#ifndef SPIRV_EXTINST_NonSemanticVulkanDebugInfo100_H_ -#define SPIRV_EXTINST_NonSemanticVulkanDebugInfo100_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -enum { NonSemanticVulkanDebugInfo100Version = 100, NonSemanticVulkanDebugInfo100Version_BitWidthPadding = 0x7fffffff }; -enum { NonSemanticVulkanDebugInfo100Revision = 2, NonSemanticVulkanDebugInfo100Revision_BitWidthPadding = 0x7fffffff }; - -enum NonSemanticVulkanDebugInfo100Instructions { - NonSemanticVulkanDebugInfo100DebugInfoNone = 0, - NonSemanticVulkanDebugInfo100DebugCompilationUnit = 1, - NonSemanticVulkanDebugInfo100DebugTypeBasic = 2, - NonSemanticVulkanDebugInfo100DebugTypePointer = 3, - NonSemanticVulkanDebugInfo100DebugTypeQualifier = 4, - NonSemanticVulkanDebugInfo100DebugTypeArray = 5, - NonSemanticVulkanDebugInfo100DebugTypeVector = 6, - NonSemanticVulkanDebugInfo100DebugTypedef = 7, - NonSemanticVulkanDebugInfo100DebugTypeFunction = 8, - NonSemanticVulkanDebugInfo100DebugTypeEnum = 9, - NonSemanticVulkanDebugInfo100DebugTypeComposite = 10, - NonSemanticVulkanDebugInfo100DebugTypeMember = 11, - NonSemanticVulkanDebugInfo100DebugTypeInheritance = 12, - NonSemanticVulkanDebugInfo100DebugTypePtrToMember = 13, - NonSemanticVulkanDebugInfo100DebugTypeTemplate = 14, - NonSemanticVulkanDebugInfo100DebugTypeTemplateParameter = 15, - NonSemanticVulkanDebugInfo100DebugTypeTemplateTemplateParameter = 16, - NonSemanticVulkanDebugInfo100DebugTypeTemplateParameterPack = 17, - NonSemanticVulkanDebugInfo100DebugGlobalVariable = 18, - NonSemanticVulkanDebugInfo100DebugFunctionDeclaration = 19, - NonSemanticVulkanDebugInfo100DebugFunction = 20, - NonSemanticVulkanDebugInfo100DebugLexicalBlock = 21, - NonSemanticVulkanDebugInfo100DebugLexicalBlockDiscriminator = 22, - NonSemanticVulkanDebugInfo100DebugScope = 23, - NonSemanticVulkanDebugInfo100DebugNoScope = 24, - NonSemanticVulkanDebugInfo100DebugInlinedAt = 25, - NonSemanticVulkanDebugInfo100DebugLocalVariable = 26, - NonSemanticVulkanDebugInfo100DebugInlinedVariable = 27, - NonSemanticVulkanDebugInfo100DebugDeclare = 28, - NonSemanticVulkanDebugInfo100DebugValue = 29, - NonSemanticVulkanDebugInfo100DebugOperation = 30, - NonSemanticVulkanDebugInfo100DebugExpression = 31, - NonSemanticVulkanDebugInfo100DebugMacroDef = 32, - NonSemanticVulkanDebugInfo100DebugMacroUndef = 33, - NonSemanticVulkanDebugInfo100DebugImportedEntity = 34, - NonSemanticVulkanDebugInfo100DebugSource = 35, - NonSemanticVulkanDebugInfo100DebugFunctionDefinition = 101, - NonSemanticVulkanDebugInfo100InstructionsMax = 0x7ffffff -}; - - -enum NonSemanticVulkanDebugInfo100DebugInfoFlags { - NonSemanticVulkanDebugInfo100FlagIsProtected = 0x01, - NonSemanticVulkanDebugInfo100FlagIsPrivate = 0x02, - NonSemanticVulkanDebugInfo100FlagIsPublic = 0x03, - NonSemanticVulkanDebugInfo100FlagIsLocal = 0x04, - NonSemanticVulkanDebugInfo100FlagIsDefinition = 0x08, - NonSemanticVulkanDebugInfo100FlagFwdDecl = 0x10, - NonSemanticVulkanDebugInfo100FlagArtificial = 0x20, - NonSemanticVulkanDebugInfo100FlagExplicit = 0x40, - NonSemanticVulkanDebugInfo100FlagPrototyped = 0x80, - NonSemanticVulkanDebugInfo100FlagObjectPointer = 0x100, - NonSemanticVulkanDebugInfo100FlagStaticMember = 0x200, - NonSemanticVulkanDebugInfo100FlagIndirectVariable = 0x400, - NonSemanticVulkanDebugInfo100FlagLValueReference = 0x800, - NonSemanticVulkanDebugInfo100FlagRValueReference = 0x1000, - NonSemanticVulkanDebugInfo100FlagIsOptimized = 0x2000, - NonSemanticVulkanDebugInfo100FlagIsEnumClass = 0x4000, - NonSemanticVulkanDebugInfo100FlagTypePassByValue = 0x8000, - NonSemanticVulkanDebugInfo100FlagTypePassByReference = 0x10000, - NonSemanticVulkanDebugInfo100DebugInfoFlagsMax = 0x7ffffff -}; - -enum NonSemanticVulkanDebugInfo100DebugBaseTypeAttributeEncoding { - NonSemanticVulkanDebugInfo100Unspecified = 0, - NonSemanticVulkanDebugInfo100Address = 1, - NonSemanticVulkanDebugInfo100Boolean = 2, - NonSemanticVulkanDebugInfo100Float = 3, - NonSemanticVulkanDebugInfo100Signed = 4, - NonSemanticVulkanDebugInfo100SignedChar = 5, - NonSemanticVulkanDebugInfo100Unsigned = 6, - NonSemanticVulkanDebugInfo100UnsignedChar = 7, - NonSemanticVulkanDebugInfo100DebugBaseTypeAttributeEncodingMax = 0x7ffffff -}; - -enum NonSemanticVulkanDebugInfo100DebugCompositeType { - NonSemanticVulkanDebugInfo100Class = 0, - NonSemanticVulkanDebugInfo100Structure = 1, - NonSemanticVulkanDebugInfo100Union = 2, - NonSemanticVulkanDebugInfo100DebugCompositeTypeMax = 0x7ffffff -}; - -enum NonSemanticVulkanDebugInfo100DebugTypeQualifier { - NonSemanticVulkanDebugInfo100ConstType = 0, - NonSemanticVulkanDebugInfo100VolatileType = 1, - NonSemanticVulkanDebugInfo100RestrictType = 2, - NonSemanticVulkanDebugInfo100AtomicType = 3, - NonSemanticVulkanDebugInfo100DebugTypeQualifierMax = 0x7ffffff -}; - -enum NonSemanticVulkanDebugInfo100DebugOperation { - NonSemanticVulkanDebugInfo100Deref = 0, - NonSemanticVulkanDebugInfo100Plus = 1, - NonSemanticVulkanDebugInfo100Minus = 2, - NonSemanticVulkanDebugInfo100PlusUconst = 3, - NonSemanticVulkanDebugInfo100BitPiece = 4, - NonSemanticVulkanDebugInfo100Swap = 5, - NonSemanticVulkanDebugInfo100Xderef = 6, - NonSemanticVulkanDebugInfo100StackValue = 7, - NonSemanticVulkanDebugInfo100Constu = 8, - NonSemanticVulkanDebugInfo100Fragment = 9, - NonSemanticVulkanDebugInfo100DebugOperationMax = 0x7ffffff -}; - -enum NonSemanticVulkanDebugInfo100DebugImportedEntity { - NonSemanticVulkanDebugInfo100ImportedModule = 0, - NonSemanticVulkanDebugInfo100ImportedDeclaration = 1, - NonSemanticVulkanDebugInfo100DebugImportedEntityMax = 0x7ffffff -}; - - -#ifdef __cplusplus -} -#endif - -#endif // SPIRV_EXTINST_NonSemanticVulkanDebugInfo100_H_ \ No newline at end of file -- cgit v1.2.3