Skip to content

A
angle
Commit 1a70e5a0 by Shahbaz Youssefi Committed by Commit Bot
Options

Add const to optional parameters of SPIR-V instruction builders

Bug: angleproject:4888 Change-Id: I70274042794a7d56db48490d9e3930e1eace02bf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2713267Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCharlie Lao <cclao@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent c2d14d03
Showing with 54 additions and 54 deletions
scripts/code_generation_hashes/SPIR-V_helpers.json
{
"src/common/spirv/gen_spirv_builder_and_parser.py":
"02381e3a7cf898265de3ba438b3b6e5e",
"4c57f0814056b5b5e80494380854371f",
"src/common/spirv/spirv_instruction_builder_autogen.cpp":
"b9c0c27ab2de86955528d4d8ba9be817",
"6ea97ca168ecccb4a621a06446e4933a",
"src/common/spirv/spirv_instruction_builder_autogen.h":
"9629f02ff30720ec38a9aad0fc5c1503",
"aa4980783495c40873598156b02b7784",
"src/common/spirv/spirv_instruction_parser_autogen.cpp":
"55d28bb4b003dbecf31e162ff996fc4f",
"src/common/spirv/spirv_instruction_parser_autogen.h":
......
src/common/spirv/gen_spirv_builder_and_parser.py
......@@ -301,7 +301,7 @@ class Writer:
type_in = 'const ' + cpp_type + 'List &'
type_out = cpp_type + 'List *'
elif is_optional:
type_in = cpp_type + ' *'
type_in = 'const ' + cpp_type + ' *'
type_out = cpp_type + ' *'
else:
type_in = cpp_type
......
src/common/spirv/spirv_instruction_builder_autogen.cpp
......@@ -59,8 +59,8 @@ void WriteSourceContinued(std::vector<uint32_t> *blob, LiteralString continuedSo
void WriteSource(std::vector<uint32_t> *blob,
spv::SourceLanguage sourceLanguage,
LiteralInteger version,
IdRef *file,
LiteralString *source)
const IdRef *file,
const LiteralString *source)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -303,7 +303,7 @@ void WriteTypeImage(std::vector<uint32_t> *blob,
LiteralInteger mS,
LiteralInteger sampled,
spv::ImageFormat imageFormat,
spv::AccessQualifier *accessQualifier)
const spv::AccessQualifier *accessQualifier)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -551,7 +551,7 @@ void WriteVariable(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
spv::StorageClass storageClass,
IdRef *initializer)
const IdRef *initializer)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -584,7 +584,7 @@ void WriteLoad(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
IdRef pointer,
spv::MemoryAccessMask *memoryAccess)
const spv::MemoryAccessMask *memoryAccess)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -600,7 +600,7 @@ void WriteLoad(std::vector<uint32_t> *blob,
void WriteStore(std::vector<uint32_t> *blob,
IdRef pointer,
IdRef object,
spv::MemoryAccessMask *memoryAccess)
const spv::MemoryAccessMask *memoryAccess)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -615,7 +615,7 @@ void WriteStore(std::vector<uint32_t> *blob,
void WriteCopyMemory(std::vector<uint32_t> *blob,
IdRef target,
IdRef source,
spv::MemoryAccessMask *memoryAccess)
const spv::MemoryAccessMask *memoryAccess)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -631,7 +631,7 @@ void WriteCopyMemorySized(std::vector<uint32_t> *blob,
IdRef target,
IdRef source,
IdRef size,
spv::MemoryAccessMask *memoryAccess)
const spv::MemoryAccessMask *memoryAccess)
{
const size_t startSize = blob->size();
blob->push_back(0);
......@@ -920,7 +920,7 @@ void WriteImageSampleImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -966,7 +966,7 @@ void WriteImageSampleDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1014,7 +1014,7 @@ void WriteImageSampleProjImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1060,7 +1060,7 @@ void WriteImageSampleProjDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1110,7 +1110,7 @@ void WriteImageFetch(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1135,7 +1135,7 @@ void WriteImageGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef component,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1161,7 +1161,7 @@ void WriteImageDrefGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1186,7 +1186,7 @@ void WriteImageRead(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -1209,7 +1209,7 @@ void WriteImageWrite(std::vector<uint32_t> *blob,
IdRef image,
IdRef coordinate,
IdRef texel,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3064,7 +3064,7 @@ void WriteImageSparseSampleImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3112,7 +3112,7 @@ void WriteImageSparseSampleDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3162,7 +3162,7 @@ void WriteImageSparseSampleProjImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3210,7 +3210,7 @@ void WriteImageSparseSampleProjDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3260,7 +3260,7 @@ void WriteImageSparseFetch(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3285,7 +3285,7 @@ void WriteImageSparseGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef component,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3311,7 +3311,7 @@ void WriteImageSparseDrefGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......@@ -3355,7 +3355,7 @@ void WriteImageSparseRead(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList)
{
const size_t startSize = blob->size();
......
src/common/spirv/spirv_instruction_builder_autogen.h
......@@ -25,8 +25,8 @@ void WriteSourceContinued(std::vector<uint32_t> *blob, LiteralString continuedSo
void WriteSource(std::vector<uint32_t> *blob,
spv::SourceLanguage sourceLanguage,
LiteralInteger version,
IdRef *file,
LiteralString *source);
const IdRef *file,
const LiteralString *source);
void WriteSourceExtension(std::vector<uint32_t> *blob, LiteralString extension);
void WriteName(std::vector<uint32_t> *blob, IdRef target, LiteralString name);
void WriteMemberName(std::vector<uint32_t> *blob,
......@@ -77,7 +77,7 @@ void WriteTypeImage(std::vector<uint32_t> *blob,
LiteralInteger mS,
LiteralInteger sampled,
spv::ImageFormat imageFormat,
spv::AccessQualifier *accessQualifier);
const spv::AccessQualifier *accessQualifier);
void WriteTypeSampler(std::vector<uint32_t> *blob, IdResult idResult);
void WriteTypeSampledImage(std::vector<uint32_t> *blob, IdResult idResult, IdRef imageType);
void WriteTypeArray(std::vector<uint32_t> *blob,
......@@ -140,7 +140,7 @@ void WriteVariable(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
spv::StorageClass storageClass,
IdRef *initializer);
const IdRef *initializer);
void WriteImageTexelPointer(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
......@@ -151,20 +151,20 @@ void WriteLoad(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
IdRef pointer,
spv::MemoryAccessMask *memoryAccess);
const spv::MemoryAccessMask *memoryAccess);
void WriteStore(std::vector<uint32_t> *blob,
IdRef pointer,
IdRef object,
spv::MemoryAccessMask *memoryAccess);
const spv::MemoryAccessMask *memoryAccess);
void WriteCopyMemory(std::vector<uint32_t> *blob,
IdRef target,
IdRef source,
spv::MemoryAccessMask *memoryAccess);
const spv::MemoryAccessMask *memoryAccess);
void WriteCopyMemorySized(std::vector<uint32_t> *blob,
IdRef target,
IdRef source,
IdRef size,
spv::MemoryAccessMask *memoryAccess);
const spv::MemoryAccessMask *memoryAccess);
void WriteAccessChain(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
......@@ -252,7 +252,7 @@ void WriteImageSampleImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSampleExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -267,7 +267,7 @@ void WriteImageSampleDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSampleDrefExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -282,7 +282,7 @@ void WriteImageSampleProjImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSampleProjExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -297,7 +297,7 @@ void WriteImageSampleProjDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSampleProjDrefExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -312,7 +312,7 @@ void WriteImageFetch(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageGather(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -320,7 +320,7 @@ void WriteImageGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef component,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageDrefGather(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -328,20 +328,20 @@ void WriteImageDrefGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageRead(std::vector<uint32_t> *blob,
IdResultType idResultType,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageWrite(std::vector<uint32_t> *blob,
IdRef image,
IdRef coordinate,
IdRef texel,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImage(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -976,7 +976,7 @@ void WriteImageSparseSampleImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseSampleExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -991,7 +991,7 @@ void WriteImageSparseSampleDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseSampleDrefExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1006,7 +1006,7 @@ void WriteImageSparseSampleProjImplicitLod(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef sampledImage,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseSampleProjExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1021,7 +1021,7 @@ void WriteImageSparseSampleProjDrefImplicitLod(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseSampleProjDrefExplicitLod(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1036,7 +1036,7 @@ void WriteImageSparseFetch(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseGather(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1044,7 +1044,7 @@ void WriteImageSparseGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef component,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseDrefGather(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1052,7 +1052,7 @@ void WriteImageSparseDrefGather(std::vector<uint32_t> *blob,
IdRef sampledImage,
IdRef coordinate,
IdRef dref,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteImageSparseTexelsResident(std::vector<uint32_t> *blob,
IdResultType idResultType,
......@@ -1064,7 +1064,7 @@ void WriteImageSparseRead(std::vector<uint32_t> *blob,
IdResult idResult,
IdRef image,
IdRef coordinate,
spv::ImageOperandsMask *imageOperands,
const spv::ImageOperandsMask *imageOperands,
const IdRefList &imageOperandIdsList);
void WriteGroupIAddNonUniformAMD(std::vector<uint32_t> *blob,
IdResultType idResultType,
......
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