diff options
Diffstat (limited to 'chromium/third_party/SPIRV-Tools/src/include')
| -rw-r--r-- | chromium/third_party/SPIRV-Tools/src/include/spirv-tools/instrument.hpp | 35 | ||||
| -rw-r--r-- | chromium/third_party/SPIRV-Tools/src/include/spirv-tools/optimizer.hpp | 7 |
2 files changed, 2 insertions, 40 deletions
diff --git a/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/instrument.hpp b/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/instrument.hpp index d3180e4442c..ef5136a8caf 100644 --- a/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/instrument.hpp +++ b/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/instrument.hpp @@ -35,10 +35,6 @@ namespace spvtools { // generated by InstrumentPass::GenDebugStreamWrite. This method is utilized // by InstBindlessCheckPass. // -// kInst2* values support version 2 of the output record format and were used -// for the transition to this format. These values have now been transferred -// to the original kInst* values. The kInst2* values are therefore DEPRECATED. -// // The first member of the debug output buffer contains the next available word // in the data stream to be written. Shaders will atomically read and update // this value so as not to overwrite each others records. This value must be @@ -94,10 +90,6 @@ static const int kInstCompOutGlobalInvocationIdX = kInstCommonOutCnt; static const int kInstCompOutGlobalInvocationIdY = kInstCommonOutCnt + 1; static const int kInstCompOutGlobalInvocationIdZ = kInstCommonOutCnt + 2; -// Compute Shader Output Record Offsets - Version 1 (DEPRECATED) -static const int kInstCompOutGlobalInvocationId = kInstCommonOutCnt; -static const int kInstCompOutUnused = kInstCommonOutCnt + 1; - // Tessellation Control Shader Output Record Offsets static const int kInstTessCtlOutInvocationId = kInstCommonOutCnt; static const int kInstTessCtlOutPrimitiveId = kInstCommonOutCnt + 1; @@ -108,10 +100,6 @@ static const int kInstTessEvalOutPrimitiveId = kInstCommonOutCnt; static const int kInstTessEvalOutTessCoordU = kInstCommonOutCnt + 1; static const int kInstTessEvalOutTessCoordV = kInstCommonOutCnt + 2; -// Tessellation Shader Output Record Offsets - Version 1 (DEPRECATED) -static const int kInstTessOutInvocationId = kInstCommonOutCnt; -static const int kInstTessOutUnused = kInstCommonOutCnt + 1; - // Geometry Shader Output Record Offsets static const int kInstGeomOutPrimitiveId = kInstCommonOutCnt; static const int kInstGeomOutInvocationId = kInstCommonOutCnt + 1; @@ -124,14 +112,12 @@ static const int kInstRayTracingOutLaunchIdZ = kInstCommonOutCnt + 2; // Size of Common and Stage-specific Members static const int kInstStageOutCnt = kInstCommonOutCnt + 3; -static const int kInst2StageOutCnt = kInstCommonOutCnt + 3; // Validation Error Code Offset // // This identifies the validation error. It also helps to identify // how many words follow in the record and their meaning. static const int kInstValidationOutError = kInstStageOutCnt; -static const int kInst2ValidationOutError = kInst2StageOutCnt; // Validation-specific Output Record Offsets // @@ -144,37 +130,19 @@ static const int kInstBindlessBoundsOutDescIndex = kInstStageOutCnt + 1; static const int kInstBindlessBoundsOutDescBound = kInstStageOutCnt + 2; static const int kInstBindlessBoundsOutCnt = kInstStageOutCnt + 3; -static const int kInst2BindlessBoundsOutDescIndex = kInst2StageOutCnt + 1; -static const int kInst2BindlessBoundsOutDescBound = kInst2StageOutCnt + 2; -static const int kInst2BindlessBoundsOutCnt = kInst2StageOutCnt + 3; - // A bindless uninitialized error will output the index. static const int kInstBindlessUninitOutDescIndex = kInstStageOutCnt + 1; static const int kInstBindlessUninitOutUnused = kInstStageOutCnt + 2; static const int kInstBindlessUninitOutCnt = kInstStageOutCnt + 3; -static const int kInst2BindlessUninitOutDescIndex = kInst2StageOutCnt + 1; -static const int kInst2BindlessUninitOutUnused = kInst2StageOutCnt + 2; -static const int kInst2BindlessUninitOutCnt = kInst2StageOutCnt + 3; - // A buffer address unalloc error will output the 64-bit pointer in // two 32-bit pieces, lower bits first. static const int kInstBuffAddrUnallocOutDescPtrLo = kInstStageOutCnt + 1; static const int kInstBuffAddrUnallocOutDescPtrHi = kInstStageOutCnt + 2; static const int kInstBuffAddrUnallocOutCnt = kInstStageOutCnt + 3; -static const int kInst2BuffAddrUnallocOutDescPtrLo = kInst2StageOutCnt + 1; -static const int kInst2BuffAddrUnallocOutDescPtrHi = kInst2StageOutCnt + 2; -static const int kInst2BuffAddrUnallocOutCnt = kInst2StageOutCnt + 3; - -// DEPRECATED -static const int kInstBindlessOutDescIndex = kInstStageOutCnt + 1; -static const int kInstBindlessOutDescBound = kInstStageOutCnt + 2; -static const int kInstBindlessOutCnt = kInstStageOutCnt + 3; - // Maximum Output Record Member Count static const int kInstMaxOutCnt = kInstStageOutCnt + 3; -static const int kInst2MaxOutCnt = kInst2StageOutCnt + 3; // Validation Error Codes // @@ -223,9 +191,6 @@ static const int kDebugOutputPrintfStream = 3; // Data[ i + Data[ b + Data[ s + Data[ kDebugInputBindlessInitOffset ] ] ] ] static const int kDebugInputBindlessInitOffset = 0; -// DEPRECATED -static const int kDebugInputBindlessOffsetReserved = 0; - // At offset kDebugInputBindlessOffsetLengths is some number of uints which // provide the bindless length data. More specifically, the number of // descriptors at (set=s, binding=b) is: diff --git a/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/optimizer.hpp b/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/optimizer.hpp index b9049232300..d393495bae3 100644 --- a/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/optimizer.hpp +++ b/chromium/third_party/SPIRV-Tools/src/include/spirv-tools/optimizer.hpp @@ -762,10 +762,9 @@ Optimizer::PassToken CreateCombineAccessChainsPass(); // |input_length_enable| controls instrumentation of runtime descriptor array // references, and |input_init_enable| controls instrumentation of descriptor // initialization checking, both of which require input buffer support. -// |version| specifies the buffer record format. Optimizer::PassToken CreateInstBindlessCheckPass( uint32_t desc_set, uint32_t shader_id, bool input_length_enable = false, - bool input_init_enable = false, uint32_t version = 2); + bool input_init_enable = false); // Create a pass to instrument physical buffer address checking // This pass instruments all physical buffer address references to check that @@ -786,10 +785,8 @@ Optimizer::PassToken CreateInstBindlessCheckPass( // The instrumentation will read and write buffers in debug // descriptor set |desc_set|. It will write |shader_id| in each output record // to identify the shader module which generated the record. -// |version| specifies the output buffer record format. Optimizer::PassToken CreateInstBuffAddrCheckPass(uint32_t desc_set, - uint32_t shader_id, - uint32_t version = 2); + uint32_t shader_id); // Create a pass to instrument OpDebugPrintf instructions. // This pass replaces all OpDebugPrintf instructions with instructions to write |