mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-09 12:00:05 +00:00
[glslang] Strip trailing whitespace
There are many other files in the repo that have trailing whitespace but this PR only cleans `glslang/SPIRV` and `glslang/Standalone`.
This commit is contained in:
parent
e06bd35fea
commit
a5bf69936d
@ -13,7 +13,7 @@
|
|||||||
**
|
**
|
||||||
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
||||||
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
||||||
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
||||||
**
|
**
|
||||||
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
@ -3393,7 +3393,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
case glslang::EOpHitObjectRecordHitNV:
|
case glslang::EOpHitObjectRecordHitNV:
|
||||||
case glslang::EOpHitObjectRecordHitMotionNV:
|
case glslang::EOpHitObjectRecordHitMotionNV:
|
||||||
case glslang::EOpHitObjectRecordHitWithIndexNV:
|
case glslang::EOpHitObjectRecordHitWithIndexNV:
|
||||||
@ -3573,7 +3573,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
|
|||||||
} else if (arg == 2) {
|
} else if (arg == 2) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// for l-values, pass the address, for r-values, pass the value
|
// for l-values, pass the address, for r-values, pass the value
|
||||||
@ -3617,8 +3617,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
|
|||||||
} else if ((arg == 10 && glslangOp == glslang::EOpTraceKHR) ||
|
} else if ((arg == 10 && glslangOp == glslang::EOpTraceKHR) ||
|
||||||
(arg == 11 && glslangOp == glslang::EOpTraceRayMotionNV) ||
|
(arg == 11 && glslangOp == glslang::EOpTraceRayMotionNV) ||
|
||||||
(arg == 1 && glslangOp == glslang::EOpExecuteCallableKHR) ||
|
(arg == 1 && glslangOp == glslang::EOpExecuteCallableKHR) ||
|
||||||
(arg == 1 && glslangOp == glslang::EOpHitObjectExecuteShaderNV) ||
|
(arg == 1 && glslangOp == glslang::EOpHitObjectExecuteShaderNV) ||
|
||||||
(arg == 11 && glslangOp == glslang::EOpHitObjectTraceRayNV) ||
|
(arg == 11 && glslangOp == glslang::EOpHitObjectTraceRayNV) ||
|
||||||
(arg == 12 && glslangOp == glslang::EOpHitObjectTraceRayMotionNV)) {
|
(arg == 12 && glslangOp == glslang::EOpHitObjectTraceRayMotionNV)) {
|
||||||
const int set = glslangOp == glslang::EOpExecuteCallableKHR ? 1 : 0;
|
const int set = glslangOp == glslang::EOpExecuteCallableKHR ? 1 : 0;
|
||||||
const int location = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getUConst();
|
const int location = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getUConst();
|
||||||
@ -4501,7 +4501,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty
|
|||||||
builder.addCapability(spv::CapabilityShaderInvocationReorderNV);
|
builder.addCapability(spv::CapabilityShaderInvocationReorderNV);
|
||||||
spvType = builder.makeHitObjectNVType();
|
spvType = builder.makeHitObjectNVType();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#ifndef GLSLANG_WEB
|
#ifndef GLSLANG_WEB
|
||||||
case glslang::EbtSpirvType: {
|
case glslang::EbtSpirvType: {
|
||||||
// GL_EXT_spirv_intrinsics
|
// GL_EXT_spirv_intrinsics
|
||||||
@ -7200,7 +7200,7 @@ spv::Id TGlslangToSpvTraverser::createUnaryOperation(glslang::TOperator op, OpDe
|
|||||||
case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
|
case glslang::EOpHitObjectGetShaderRecordBufferHandleNV:
|
||||||
unaryOp = spv::OpHitObjectGetShaderRecordBufferHandleNV;
|
unaryOp = spv::OpHitObjectGetShaderRecordBufferHandleNV;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case glslang::EOpCopyObject:
|
case glslang::EOpCopyObject:
|
||||||
@ -9068,7 +9068,7 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
|
|||||||
builder.createNoResultOp(spv::OpReorderThreadWithHitObjectNV, operands);
|
builder.createNoResultOp(spv::OpReorderThreadWithHitObjectNV, operands);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif // GLSLANG_WEB
|
#endif // GLSLANG_WEB
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
// Copyright (c) 2020 The Khronos Group Inc.
|
// Copyright (c) 2020 The Khronos Group Inc.
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
// copy of this software and/or associated documentation files (the
|
// copy of this software and/or associated documentation files (the
|
||||||
// "Materials"), to deal in the Materials without restriction, including
|
// "Materials"), to deal in the Materials without restriction, including
|
||||||
@ -7,15 +7,15 @@
|
|||||||
// distribute, sublicense, and/or sell copies of the Materials, and to
|
// distribute, sublicense, and/or sell copies of the Materials, and to
|
||||||
// permit persons to whom the Materials are furnished to do so, subject to
|
// permit persons to whom the Materials are furnished to do so, subject to
|
||||||
// the following conditions:
|
// the following conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be included
|
// The above copyright notice and this permission notice shall be included
|
||||||
// in all copies or substantial portions of the Materials.
|
// in all copies or substantial portions of the Materials.
|
||||||
//
|
//
|
||||||
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
|
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
|
||||||
// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
|
// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
|
||||||
// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
|
// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
|
||||||
// https://www.khronos.org/registry/
|
// https://www.khronos.org/registry/
|
||||||
//
|
//
|
||||||
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
@ -23,7 +23,7 @@
|
|||||||
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||||
// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef SPIRV_UNIFIED1_NonSemanticDebugPrintf_H_
|
#ifndef SPIRV_UNIFIED1_NonSemanticDebugPrintf_H_
|
||||||
#define SPIRV_UNIFIED1_NonSemanticDebugPrintf_H_
|
#define SPIRV_UNIFIED1_NonSemanticDebugPrintf_H_
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
// Copyright (c) 2018 The Khronos Group Inc.
|
// Copyright (c) 2018 The Khronos Group Inc.
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
// of this software and/or associated documentation files (the "Materials"),
|
// of this software and/or associated documentation files (the "Materials"),
|
||||||
// to deal in the Materials without restriction, including without limitation
|
// to deal in the Materials without restriction, including without limitation
|
||||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
// and/or sell copies of the Materials, and to permit persons to whom the
|
// 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:
|
// Materials are furnished to do so, subject to the following conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be included in
|
// The above copyright notice and this permission notice shall be included in
|
||||||
// all copies or substantial portions of the Materials.
|
// all copies or substantial portions of the Materials.
|
||||||
//
|
//
|
||||||
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
||||||
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
||||||
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
||||||
//
|
//
|
||||||
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
@ -103,7 +103,7 @@ public:
|
|||||||
stringIds[file_c_str] = strId;
|
stringIds[file_c_str] = strId;
|
||||||
return strId;
|
return strId;
|
||||||
}
|
}
|
||||||
spv::Id getSourceFile() const
|
spv::Id getSourceFile() const
|
||||||
{
|
{
|
||||||
return sourceFileStringId;
|
return sourceFileStringId;
|
||||||
}
|
}
|
||||||
|
@ -515,7 +515,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
|
|||||||
} else if (strcmp(spv::E_SPV_NV_sample_mask_override_coverage, name) == 0 ||
|
} else if (strcmp(spv::E_SPV_NV_sample_mask_override_coverage, name) == 0 ||
|
||||||
strcmp(spv::E_SPV_NV_geometry_shader_passthrough, name) == 0 ||
|
strcmp(spv::E_SPV_NV_geometry_shader_passthrough, name) == 0 ||
|
||||||
strcmp(spv::E_SPV_NV_viewport_array2, name) == 0 ||
|
strcmp(spv::E_SPV_NV_viewport_array2, name) == 0 ||
|
||||||
strcmp(spv::E_SPV_NVX_multiview_per_view_attributes, name) == 0 ||
|
strcmp(spv::E_SPV_NVX_multiview_per_view_attributes, name) == 0 ||
|
||||||
strcmp(spv::E_SPV_NV_fragment_shader_barycentric, name) == 0 ||
|
strcmp(spv::E_SPV_NV_fragment_shader_barycentric, name) == 0 ||
|
||||||
strcmp(spv::E_SPV_NV_mesh_shader, name) == 0) {
|
strcmp(spv::E_SPV_NV_mesh_shader, name) == 0) {
|
||||||
extInstSet = GLSLextNVInst;
|
extInstSet = GLSLextNVInst;
|
||||||
|
@ -318,7 +318,7 @@ const char* DecorationString(int decoration)
|
|||||||
case DecorationPerPrimitiveNV: return "PerPrimitiveNV";
|
case DecorationPerPrimitiveNV: return "PerPrimitiveNV";
|
||||||
case DecorationPerViewNV: return "PerViewNV";
|
case DecorationPerViewNV: return "PerViewNV";
|
||||||
case DecorationPerTaskNV: return "PerTaskNV";
|
case DecorationPerTaskNV: return "PerTaskNV";
|
||||||
|
|
||||||
case DecorationPerVertexKHR: return "PerVertexKHR";
|
case DecorationPerVertexKHR: return "PerVertexKHR";
|
||||||
|
|
||||||
case DecorationNonUniformEXT: return "DecorationNonUniformEXT";
|
case DecorationNonUniformEXT: return "DecorationNonUniformEXT";
|
||||||
@ -584,7 +584,7 @@ const char* ImageChannelOrderString(int format)
|
|||||||
case 17: return "sRGBA";
|
case 17: return "sRGBA";
|
||||||
case 18: return "sBGRA";
|
case 18: return "sBGRA";
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return "Bad";
|
return "Bad";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -870,7 +870,7 @@ const char* CapabilityString(int info)
|
|||||||
case 22: return "Int16";
|
case 22: return "Int16";
|
||||||
case 23: return "TessellationPointSize";
|
case 23: return "TessellationPointSize";
|
||||||
case 24: return "GeometryPointSize";
|
case 24: return "GeometryPointSize";
|
||||||
case 25: return "ImageGatherExtended";
|
case 25: return "ImageGatherExtended";
|
||||||
case 26: return "Bad";
|
case 26: return "Bad";
|
||||||
case 27: return "StorageImageMultisample";
|
case 27: return "StorageImageMultisample";
|
||||||
case 28: return "UniformBufferArrayDynamicIndexing";
|
case 28: return "UniformBufferArrayDynamicIndexing";
|
||||||
@ -2253,11 +2253,11 @@ void Parameterize()
|
|||||||
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Base'");
|
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Base'");
|
||||||
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Offset'");
|
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Offset'");
|
||||||
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Count'");
|
InstructionDesc[OpBitFieldSExtract].operands.push(OperandId, "'Count'");
|
||||||
|
|
||||||
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Base'");
|
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Base'");
|
||||||
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Offset'");
|
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Offset'");
|
||||||
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Count'");
|
InstructionDesc[OpBitFieldUExtract].operands.push(OperandId, "'Count'");
|
||||||
|
|
||||||
InstructionDesc[OpBitReverse].operands.push(OperandId, "'Base'");
|
InstructionDesc[OpBitReverse].operands.push(OperandId, "'Base'");
|
||||||
|
|
||||||
InstructionDesc[OpBitCount].operands.push(OperandId, "'Base'");
|
InstructionDesc[OpBitCount].operands.push(OperandId, "'Base'");
|
||||||
@ -2937,7 +2937,7 @@ void Parameterize()
|
|||||||
InstructionDesc[OpTerminateRayNV].setResultAndType(false, false);
|
InstructionDesc[OpTerminateRayNV].setResultAndType(false, false);
|
||||||
|
|
||||||
InstructionDesc[OpTerminateRayKHR].setResultAndType(false, false);
|
InstructionDesc[OpTerminateRayKHR].setResultAndType(false, false);
|
||||||
|
|
||||||
InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "SBT Record Index");
|
InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "SBT Record Index");
|
||||||
InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "CallableData ID");
|
InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "CallableData ID");
|
||||||
InstructionDesc[OpExecuteCallableNV].setResultAndType(false, false);
|
InstructionDesc[OpExecuteCallableNV].setResultAndType(false, false);
|
||||||
@ -3053,7 +3053,7 @@ void Parameterize()
|
|||||||
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Coarse'");
|
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandId, "'Coarse'");
|
||||||
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandImageOperands, "", true);
|
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandImageOperands, "", true);
|
||||||
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandVariableIds, "", true);
|
InstructionDesc[OpImageSampleFootprintNV].operands.push(OperandVariableIds, "", true);
|
||||||
|
|
||||||
InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Index Offset'");
|
InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Index Offset'");
|
||||||
InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Packed Indices'");
|
InstructionDesc[OpWritePackedPrimitiveIndices4x8NV].operands.push(OperandId, "'Packed Indices'");
|
||||||
|
|
||||||
@ -3099,7 +3099,7 @@ void Parameterize()
|
|||||||
InstructionDesc[OpReadClockKHR].operands.push(OperandScope, "'Scope'");
|
InstructionDesc[OpReadClockKHR].operands.push(OperandScope, "'Scope'");
|
||||||
|
|
||||||
InstructionDesc[OpTypeHitObjectNV].setResultAndType(true, false);
|
InstructionDesc[OpTypeHitObjectNV].setResultAndType(true, false);
|
||||||
|
|
||||||
InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].operands.push(OperandId, "'HitObject'");
|
InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].operands.push(OperandId, "'HitObject'");
|
||||||
InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].setResultAndType(true, true);
|
InstructionDesc[OpHitObjectGetShaderRecordBufferHandleNV].setResultAndType(true, true);
|
||||||
|
|
||||||
@ -3117,7 +3117,7 @@ void Parameterize()
|
|||||||
|
|
||||||
InstructionDesc[OpHitObjectGetHitKindNV].operands.push(OperandId, "'HitObject'");
|
InstructionDesc[OpHitObjectGetHitKindNV].operands.push(OperandId, "'HitObject'");
|
||||||
InstructionDesc[OpHitObjectGetHitKindNV].setResultAndType(true, true);
|
InstructionDesc[OpHitObjectGetHitKindNV].setResultAndType(true, true);
|
||||||
|
|
||||||
InstructionDesc[OpHitObjectGetPrimitiveIndexNV].operands.push(OperandId, "'HitObject'");
|
InstructionDesc[OpHitObjectGetPrimitiveIndexNV].operands.push(OperandId, "'HitObject'");
|
||||||
InstructionDesc[OpHitObjectGetPrimitiveIndexNV].setResultAndType(true, true);
|
InstructionDesc[OpHitObjectGetPrimitiveIndexNV].setResultAndType(true, true);
|
||||||
|
|
||||||
@ -3173,7 +3173,7 @@ void Parameterize()
|
|||||||
InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'HitObject'");
|
InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'HitObject'");
|
||||||
InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'Payload'");
|
InstructionDesc[OpHitObjectExecuteShaderNV].operands.push(OperandId, "'Payload'");
|
||||||
InstructionDesc[OpHitObjectExecuteShaderNV].setResultAndType(false, false);
|
InstructionDesc[OpHitObjectExecuteShaderNV].setResultAndType(false, false);
|
||||||
|
|
||||||
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'HitObject'");
|
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'HitObject'");
|
||||||
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'Acceleration Structure'");
|
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'Acceleration Structure'");
|
||||||
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'InstanceId'");
|
InstructionDesc[OpHitObjectRecordHitNV].operands.push(OperandId, "'InstanceId'");
|
||||||
|
@ -197,7 +197,7 @@ public:
|
|||||||
// Parameterize a set of enumerants that form an enum
|
// Parameterize a set of enumerants that form an enum
|
||||||
class EnumDefinition : public EnumParameters {
|
class EnumDefinition : public EnumParameters {
|
||||||
public:
|
public:
|
||||||
EnumDefinition() :
|
EnumDefinition() :
|
||||||
ceiling(0), bitmask(false), getName(nullptr), enumParams(nullptr), operandParams(nullptr) { }
|
ceiling(0), bitmask(false), getName(nullptr), enumParams(nullptr), operandParams(nullptr) { }
|
||||||
void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false)
|
void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false)
|
||||||
{
|
{
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
// Copyright (c) 2014-2020 The Khronos Group Inc.
|
// Copyright (c) 2014-2020 The Khronos Group Inc.
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
// of this software and/or associated documentation files (the "Materials"),
|
// of this software and/or associated documentation files (the "Materials"),
|
||||||
// to deal in the Materials without restriction, including without limitation
|
// to deal in the Materials without restriction, including without limitation
|
||||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
// and/or sell copies of the Materials, and to permit persons to whom the
|
// 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:
|
// Materials are furnished to do so, subject to the following conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be included in
|
// The above copyright notice and this permission notice shall be included in
|
||||||
// all copies or substantial portions of the Materials.
|
// all copies or substantial portions of the Materials.
|
||||||
//
|
//
|
||||||
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
|
||||||
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
// STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
|
||||||
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
// HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
|
||||||
//
|
//
|
||||||
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
// Enumeration tokens for SPIR-V, in various styles:
|
// Enumeration tokens for SPIR-V, in various styles:
|
||||||
// C, C++, C++11, JSON, Lua, Python, C#, D, Beef
|
// C, C++, C++11, JSON, Lua, Python, C#, D, Beef
|
||||||
//
|
//
|
||||||
// - C will have tokens with a "Spv" prefix, e.g.: SpvSourceLanguageGLSL
|
// - C will have tokens with a "Spv" prefix, e.g.: SpvSourceLanguageGLSL
|
||||||
// - C++ will have tokens in the "spv" name space, e.g.: spv::SourceLanguageGLSL
|
// - C++ will have tokens in the "spv" name space, e.g.: spv::SourceLanguageGLSL
|
||||||
// - C++11 will use enum classes in the spv namespace, e.g.: spv::SourceLanguage::GLSL
|
// - C++11 will use enum classes in the spv namespace, e.g.: spv::SourceLanguage::GLSL
|
||||||
@ -38,7 +38,7 @@
|
|||||||
// - D will have tokens under the "spv" module, e.g: spv.SourceLanguage.GLSL
|
// - D will have tokens under the "spv" module, e.g: spv.SourceLanguage.GLSL
|
||||||
// - Beef will use enum classes in the Specification class located in the "Spv" namespace,
|
// - Beef will use enum classes in the Specification class located in the "Spv" namespace,
|
||||||
// e.g.: Spv.Specification.SourceLanguage.GLSL
|
// e.g.: Spv.Specification.SourceLanguage.GLSL
|
||||||
//
|
//
|
||||||
// Some tokens act like mask values, which can be OR'd together,
|
// Some tokens act like mask values, which can be OR'd together,
|
||||||
// while others are mutually exclusive. The mask-like ones have
|
// while others are mutually exclusive. The mask-like ones have
|
||||||
// "Mask" in their name, and a parallel enum that has the shift
|
// "Mask" in their name, and a parallel enum that has the shift
|
||||||
|
@ -386,7 +386,7 @@ public:
|
|||||||
if (lineInstruction != nullptr) {
|
if (lineInstruction != nullptr) {
|
||||||
lineInstruction->dump(out);
|
lineInstruction->dump(out);
|
||||||
}
|
}
|
||||||
|
|
||||||
// OpFunction
|
// OpFunction
|
||||||
functionInstruction.dump(out);
|
functionInstruction.dump(out);
|
||||||
|
|
||||||
|
@ -725,7 +725,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
|
|||||||
HlslDxPositionW = true;
|
HlslDxPositionW = true;
|
||||||
} else if (lowerword == "enhanced-msgs") {
|
} else if (lowerword == "enhanced-msgs") {
|
||||||
EnhancedMsgs = true;
|
EnhancedMsgs = true;
|
||||||
} else if (lowerword == "auto-sampled-textures") {
|
} else if (lowerword == "auto-sampled-textures") {
|
||||||
autoSampledTextures = true;
|
autoSampledTextures = true;
|
||||||
} else if (lowerword == "invert-y" || // synonyms
|
} else if (lowerword == "invert-y" || // synonyms
|
||||||
lowerword == "iy") {
|
lowerword == "iy") {
|
||||||
@ -1973,7 +1973,7 @@ void usage()
|
|||||||
" without explicit bindings\n"
|
" without explicit bindings\n"
|
||||||
" --auto-map-locations | --aml automatically locate input/output lacking\n"
|
" --auto-map-locations | --aml automatically locate input/output lacking\n"
|
||||||
" 'location' (fragile, not cross stage)\n"
|
" 'location' (fragile, not cross stage)\n"
|
||||||
" --auto-sampled-textures Removes sampler variables and converts\n"
|
" --auto-sampled-textures Removes sampler variables and converts\n"
|
||||||
" existing textures to sampled textures\n"
|
" existing textures to sampled textures\n"
|
||||||
" --client {vulkan<ver>|opengl<ver>} see -V and -G\n"
|
" --client {vulkan<ver>|opengl<ver>} see -V and -G\n"
|
||||||
" --depfile <file> writes depfile for build systems\n"
|
" --depfile <file> writes depfile for build systems\n"
|
||||||
|
Loading…
Reference in New Issue
Block a user