Skip to content

G
glslang
Commit 4016e38b by John Kessenich
Options

Build: Switch to Rev. 6 of headers, removing "BadValue" enum stuff.

Note: Technically, this is glslang's modified private copy of official headers. Official headers will appear in other places, like https://github.com/KhronosGroup/SPIRV-Headers.
parent efb89a3d
Showing with 72 additions and 40 deletions
SPIRV/SpvBuilder.cpp
...@@ -907,7 +907,7 @@ void Builder::addLine(Id target, Id fileName, int lineNum, int column) ...@@ -907,7 +907,7 @@ void Builder::addLine(Id target, Id fileName, int lineNum, int column)
void Builder::addDecoration(Id id, Decoration decoration, int num) void Builder::addDecoration(Id id, Decoration decoration, int num)
{ {
if (decoration == (spv::Decoration)spv::BadValue) if (decoration == spv::DecorationMax)
return; return;
Instruction* dec = new Instruction(OpDecorate); Instruction* dec = new Instruction(OpDecorate);
dec->addIdOperand(id); dec->addIdOperand(id);
......
SPIRV/spirv.hpp
...@@ -47,11 +47,11 @@ namespace spv { ...@@ -47,11 +47,11 @@ namespace spv {
typedef unsigned int Id; typedef unsigned int Id;
#define SPV_VERSION 0x10000 #define SPV_VERSION 0x10000
#define SPV_REVISION 3 #define SPV_REVISION 6
static const unsigned int MagicNumber = 0x07230203; static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010000; static const unsigned int Version = 0x00010000;
static const unsigned int Revision = 3; static const unsigned int Revision = 6;
static const unsigned int OpCodeMask = 0xffff; static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16; static const unsigned int WordCountShift = 16;
...@@ -62,6 +62,7 @@ enum SourceLanguage { ...@@ -62,6 +62,7 @@ enum SourceLanguage {
SourceLanguageOpenCL_C = 3, SourceLanguageOpenCL_C = 3,
SourceLanguageOpenCL_CPP = 4, SourceLanguageOpenCL_CPP = 4,
SourceLanguageHLSL = 5, SourceLanguageHLSL = 5,
SourceLanguageMax = 0x7fffffff,
}; };
enum ExecutionModel { enum ExecutionModel {
...@@ -72,18 +73,21 @@ enum ExecutionModel { ...@@ -72,18 +73,21 @@ enum ExecutionModel {
ExecutionModelFragment = 4, ExecutionModelFragment = 4,
ExecutionModelGLCompute = 5, ExecutionModelGLCompute = 5,
ExecutionModelKernel = 6, ExecutionModelKernel = 6,
ExecutionModelMax = 0x7fffffff,
}; };
enum AddressingModel { enum AddressingModel {
AddressingModelLogical = 0, AddressingModelLogical = 0,
AddressingModelPhysical32 = 1, AddressingModelPhysical32 = 1,
AddressingModelPhysical64 = 2, AddressingModelPhysical64 = 2,
AddressingModelMax = 0x7fffffff,
}; };
enum MemoryModel { enum MemoryModel {
MemoryModelSimple = 0, MemoryModelSimple = 0,
MemoryModelGLSL450 = 1, MemoryModelGLSL450 = 1,
MemoryModelOpenCL = 2, MemoryModelOpenCL = 2,
MemoryModelMax = 0x7fffffff,
}; };
enum ExecutionMode { enum ExecutionMode {
...@@ -118,6 +122,7 @@ enum ExecutionMode { ...@@ -118,6 +122,7 @@ enum ExecutionMode {
ExecutionModeOutputTriangleStrip = 29, ExecutionModeOutputTriangleStrip = 29,
ExecutionModeVecTypeHint = 30, ExecutionModeVecTypeHint = 30,
ExecutionModeContractionOff = 31, ExecutionModeContractionOff = 31,
ExecutionModeMax = 0x7fffffff,
}; };
enum StorageClass { enum StorageClass {
...@@ -133,6 +138,7 @@ enum StorageClass { ...@@ -133,6 +138,7 @@ enum StorageClass {
StorageClassPushConstant = 9, StorageClassPushConstant = 9,
StorageClassAtomicCounter = 10, StorageClassAtomicCounter = 10,
StorageClassImage = 11, StorageClassImage = 11,
StorageClassMax = 0x7fffffff,
}; };
enum Dim { enum Dim {
...@@ -143,6 +149,7 @@ enum Dim { ...@@ -143,6 +149,7 @@ enum Dim {
DimRect = 4, DimRect = 4,
DimBuffer = 5, DimBuffer = 5,
DimSubpassData = 6, DimSubpassData = 6,
DimMax = 0x7fffffff,
}; };
enum SamplerAddressingMode { enum SamplerAddressingMode {
...@@ -151,11 +158,13 @@ enum SamplerAddressingMode { ...@@ -151,11 +158,13 @@ enum SamplerAddressingMode {
SamplerAddressingModeClamp = 2, SamplerAddressingModeClamp = 2,
SamplerAddressingModeRepeat = 3, SamplerAddressingModeRepeat = 3,
SamplerAddressingModeRepeatMirrored = 4, SamplerAddressingModeRepeatMirrored = 4,
SamplerAddressingModeMax = 0x7fffffff,
}; };
enum SamplerFilterMode { enum SamplerFilterMode {
SamplerFilterModeNearest = 0, SamplerFilterModeNearest = 0,
SamplerFilterModeLinear = 1, SamplerFilterModeLinear = 1,
SamplerFilterModeMax = 0x7fffffff,
}; };
enum ImageFormat { enum ImageFormat {
...@@ -199,6 +208,7 @@ enum ImageFormat { ...@@ -199,6 +208,7 @@ enum ImageFormat {
ImageFormatRg8ui = 37, ImageFormatRg8ui = 37,
ImageFormatR16ui = 38, ImageFormatR16ui = 38,
ImageFormatR8ui = 39, ImageFormatR8ui = 39,
ImageFormatMax = 0x7fffffff,
}; };
enum ImageChannelOrder { enum ImageChannelOrder {
...@@ -221,6 +231,8 @@ enum ImageChannelOrder { ...@@ -221,6 +231,8 @@ enum ImageChannelOrder {
ImageChannelOrdersRGBx = 16, ImageChannelOrdersRGBx = 16,
ImageChannelOrdersRGBA = 17, ImageChannelOrdersRGBA = 17,
ImageChannelOrdersBGRA = 18, ImageChannelOrdersBGRA = 18,
ImageChannelOrderABGR = 19,
ImageChannelOrderMax = 0x7fffffff,
}; };
enum ImageChannelDataType { enum ImageChannelDataType {
...@@ -241,6 +253,7 @@ enum ImageChannelDataType { ...@@ -241,6 +253,7 @@ enum ImageChannelDataType {
ImageChannelDataTypeFloat = 14, ImageChannelDataTypeFloat = 14,
ImageChannelDataTypeUnormInt24 = 15, ImageChannelDataTypeUnormInt24 = 15,
ImageChannelDataTypeUnormInt101010_2 = 16, ImageChannelDataTypeUnormInt101010_2 = 16,
ImageChannelDataTypeMax = 0x7fffffff,
}; };
enum ImageOperandsShift { enum ImageOperandsShift {
...@@ -252,6 +265,7 @@ enum ImageOperandsShift { ...@@ -252,6 +265,7 @@ enum ImageOperandsShift {
ImageOperandsConstOffsetsShift = 5, ImageOperandsConstOffsetsShift = 5,
ImageOperandsSampleShift = 6, ImageOperandsSampleShift = 6,
ImageOperandsMinLodShift = 7, ImageOperandsMinLodShift = 7,
ImageOperandsMax = 0x7fffffff,
}; };
enum ImageOperandsMask { enum ImageOperandsMask {
...@@ -272,6 +286,7 @@ enum FPFastMathModeShift { ...@@ -272,6 +286,7 @@ enum FPFastMathModeShift {
FPFastMathModeNSZShift = 2, FPFastMathModeNSZShift = 2,
FPFastMathModeAllowRecipShift = 3, FPFastMathModeAllowRecipShift = 3,
FPFastMathModeFastShift = 4, FPFastMathModeFastShift = 4,
FPFastMathModeMax = 0x7fffffff,
}; };
enum FPFastMathModeMask { enum FPFastMathModeMask {
...@@ -288,17 +303,20 @@ enum FPRoundingMode { ...@@ -288,17 +303,20 @@ enum FPRoundingMode {
FPRoundingModeRTZ = 1, FPRoundingModeRTZ = 1,
FPRoundingModeRTP = 2, FPRoundingModeRTP = 2,
FPRoundingModeRTN = 3, FPRoundingModeRTN = 3,
FPRoundingModeMax = 0x7fffffff,
}; };
enum LinkageType { enum LinkageType {
LinkageTypeExport = 0, LinkageTypeExport = 0,
LinkageTypeImport = 1, LinkageTypeImport = 1,
LinkageTypeMax = 0x7fffffff,
}; };
enum AccessQualifier { enum AccessQualifier {
AccessQualifierReadOnly = 0, AccessQualifierReadOnly = 0,
AccessQualifierWriteOnly = 1, AccessQualifierWriteOnly = 1,
AccessQualifierReadWrite = 2, AccessQualifierReadWrite = 2,
AccessQualifierMax = 0x7fffffff,
}; };
enum FunctionParameterAttribute { enum FunctionParameterAttribute {
...@@ -310,6 +328,7 @@ enum FunctionParameterAttribute { ...@@ -310,6 +328,7 @@ enum FunctionParameterAttribute {
FunctionParameterAttributeNoCapture = 5, FunctionParameterAttributeNoCapture = 5,
FunctionParameterAttributeNoWrite = 6, FunctionParameterAttributeNoWrite = 6,
FunctionParameterAttributeNoReadWrite = 7, FunctionParameterAttributeNoReadWrite = 7,
FunctionParameterAttributeMax = 0x7fffffff,
}; };
enum Decoration { enum Decoration {
...@@ -356,6 +375,7 @@ enum Decoration { ...@@ -356,6 +375,7 @@ enum Decoration {
DecorationNoContraction = 42, DecorationNoContraction = 42,
DecorationInputAttachmentIndex = 43, DecorationInputAttachmentIndex = 43,
DecorationAlignment = 44, DecorationAlignment = 44,
DecorationMax = 0x7fffffff,
}; };
enum BuiltIn { enum BuiltIn {
...@@ -400,11 +420,13 @@ enum BuiltIn { ...@@ -400,11 +420,13 @@ enum BuiltIn {
BuiltInSubgroupLocalInvocationId = 41, BuiltInSubgroupLocalInvocationId = 41,
BuiltInVertexIndex = 42, BuiltInVertexIndex = 42,
BuiltInInstanceIndex = 43, BuiltInInstanceIndex = 43,
BuiltInMax = 0x7fffffff,
}; };
enum SelectionControlShift { enum SelectionControlShift {
SelectionControlFlattenShift = 0, SelectionControlFlattenShift = 0,
SelectionControlDontFlattenShift = 1, SelectionControlDontFlattenShift = 1,
SelectionControlMax = 0x7fffffff,
}; };
enum SelectionControlMask { enum SelectionControlMask {
...@@ -416,6 +438,7 @@ enum SelectionControlMask { ...@@ -416,6 +438,7 @@ enum SelectionControlMask {
enum LoopControlShift { enum LoopControlShift {
LoopControlUnrollShift = 0, LoopControlUnrollShift = 0,
LoopControlDontUnrollShift = 1, LoopControlDontUnrollShift = 1,
LoopControlMax = 0x7fffffff,
}; };
enum LoopControlMask { enum LoopControlMask {
...@@ -429,6 +452,7 @@ enum FunctionControlShift { ...@@ -429,6 +452,7 @@ enum FunctionControlShift {
FunctionControlDontInlineShift = 1, FunctionControlDontInlineShift = 1,
FunctionControlPureShift = 2, FunctionControlPureShift = 2,
FunctionControlConstShift = 3, FunctionControlConstShift = 3,
FunctionControlMax = 0x7fffffff,
}; };
enum FunctionControlMask { enum FunctionControlMask {
...@@ -450,6 +474,7 @@ enum MemorySemanticsShift { ...@@ -450,6 +474,7 @@ enum MemorySemanticsShift {
MemorySemanticsCrossWorkgroupMemoryShift = 9, MemorySemanticsCrossWorkgroupMemoryShift = 9,
MemorySemanticsAtomicCounterMemoryShift = 10, MemorySemanticsAtomicCounterMemoryShift = 10,
MemorySemanticsImageMemoryShift = 11, MemorySemanticsImageMemoryShift = 11,
MemorySemanticsMax = 0x7fffffff,
}; };
enum MemorySemanticsMask { enum MemorySemanticsMask {
...@@ -470,6 +495,7 @@ enum MemoryAccessShift { ...@@ -470,6 +495,7 @@ enum MemoryAccessShift {
MemoryAccessVolatileShift = 0, MemoryAccessVolatileShift = 0,
MemoryAccessAlignedShift = 1, MemoryAccessAlignedShift = 1,
MemoryAccessNontemporalShift = 2, MemoryAccessNontemporalShift = 2,
MemoryAccessMax = 0x7fffffff,
}; };
enum MemoryAccessMask { enum MemoryAccessMask {
...@@ -485,22 +511,26 @@ enum Scope { ...@@ -485,22 +511,26 @@ enum Scope {
ScopeWorkgroup = 2, ScopeWorkgroup = 2,
ScopeSubgroup = 3, ScopeSubgroup = 3,
ScopeInvocation = 4, ScopeInvocation = 4,
ScopeMax = 0x7fffffff,
}; };
enum GroupOperation { enum GroupOperation {
GroupOperationReduce = 0, GroupOperationReduce = 0,
GroupOperationInclusiveScan = 1, GroupOperationInclusiveScan = 1,
GroupOperationExclusiveScan = 2, GroupOperationExclusiveScan = 2,
GroupOperationMax = 0x7fffffff,
}; };
enum KernelEnqueueFlags { enum KernelEnqueueFlags {
KernelEnqueueFlagsNoWait = 0, KernelEnqueueFlagsNoWait = 0,
KernelEnqueueFlagsWaitKernel = 1, KernelEnqueueFlagsWaitKernel = 1,
KernelEnqueueFlagsWaitWorkGroup = 2, KernelEnqueueFlagsWaitWorkGroup = 2,
KernelEnqueueFlagsMax = 0x7fffffff,
}; };
enum KernelProfilingInfoShift { enum KernelProfilingInfoShift {
KernelProfilingInfoCmdExecTimeShift = 0, KernelProfilingInfoCmdExecTimeShift = 0,
KernelProfilingInfoMax = 0x7fffffff,
}; };
enum KernelProfilingInfoMask { enum KernelProfilingInfoMask {
...@@ -565,6 +595,7 @@ enum Capability { ...@@ -565,6 +595,7 @@ enum Capability {
CapabilityStorageImageReadWithoutFormat = 55, CapabilityStorageImageReadWithoutFormat = 55,
CapabilityStorageImageWriteWithoutFormat = 56, CapabilityStorageImageWriteWithoutFormat = 56,
CapabilityMultiViewport = 57, CapabilityMultiViewport = 57,
CapabilityMax = 0x7fffffff,
}; };
enum Op { enum Op {
...@@ -862,6 +893,7 @@ enum Op { ...@@ -862,6 +893,7 @@ enum Op {
OpAtomicFlagTestAndSet = 318, OpAtomicFlagTestAndSet = 318,
OpAtomicFlagClear = 319, OpAtomicFlagClear = 319,
OpImageSparseRead = 320, OpImageSparseRead = 320,
OpMax = 0x7fffffff,
}; };
// Overload operator| for mask bit combining // Overload operator| for mask bit combining
...@@ -878,3 +910,4 @@ inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfil ...@@ -878,3 +910,4 @@ inline KernelProfilingInfoMask operator|(KernelProfilingInfoMask a, KernelProfil
} // end namespace spv } // end namespace spv
#endif // #ifndef spirv_HPP #endif // #ifndef spirv_HPP
SPIRV/spvIR.h
...@@ -64,8 +64,7 @@ class Module; ...@@ -64,8 +64,7 @@ class Module;
const Id NoResult = 0; const Id NoResult = 0;
const Id NoType = 0; const Id NoType = 0;
const unsigned int BadValue = 0xFFFFFFFF; const Decoration NoPrecision = DecorationMax;
const Decoration NoPrecision = (Decoration)BadValue;
const MemorySemanticsMask MemorySemanticsAllMemory = const MemorySemanticsMask MemorySemanticsAllMemory =
(MemorySemanticsMask)(MemorySemanticsSequentiallyConsistentMask | (MemorySemanticsMask)(MemorySemanticsSequentiallyConsistentMask |
MemorySemanticsUniformMemoryMask | MemorySemanticsUniformMemoryMask |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment