Skip to content

Commit 5d9b8e2

Browse files
KangzDawn LUCI CQ
Kangz
authored and
Dawn LUCI CQ
committed
[dawn][native] Rename ExternalTextureBindingInfo::params->metadata
This is to match Tint that calls that expanded binding metadata. Bug: Change-Id: I4d44481288e696a3708920fa00fe4a6f5da1f5bd Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/264214 Reviewed-by: Loko Kung <[email protected]> Commit-Queue: Corentin Wallez <[email protected]>
1 parent 2ba38fc commit 5d9b8e2

File tree

8 files changed

+21
-21
lines changed

8 files changed

+21
-21
lines changed

‎src/dawn/native/BindGroup.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -781,11 +781,11 @@ MaybeError BindGroupBase::Initialize(const UnpackedPtr<BindGroupDescriptor>& des
781781
mBindingData.bindings[info.plane1] =
782782
externalTextureBindingEntry->externalTexture->GetTextureViews()[1];
783783

784-
DAWN_ASSERT(mBindingData.bindings[info.params] == nullptr);
785-
mBindingData.bindings[info.params] =
784+
DAWN_ASSERT(mBindingData.bindings[info.metadata] == nullptr);
785+
mBindingData.bindings[info.metadata] =
786786
externalTextureBindingEntry->externalTexture->GetParamsBuffer();
787-
mBindingData.bufferData[info.params].offset = 0;
788-
mBindingData.bufferData[info.params].size =
787+
mBindingData.bufferData[info.metadata].offset = 0;
788+
mBindingData.bufferData[info.metadata].size =
789789
sizeof(dawn::native::ExternalTextureParams);
790790
return {};
791791
}
@@ -801,13 +801,13 @@ MaybeError BindGroupBase::Initialize(const UnpackedPtr<BindGroupDescriptor>& des
801801
DAWN_TRY_ASSIGN(mBindingData.bindings[info.plane1],
802802
GetDevice()->GetOrCreatePlaceholderTextureViewForExternalTexture());
803803

804-
DAWN_ASSERT(mBindingData.bindings[info.params] == nullptr);
804+
DAWN_ASSERT(mBindingData.bindings[info.metadata] == nullptr);
805805
Ref<BufferBase> paramsBuffer;
806806
DAWN_TRY_ASSIGN(paramsBuffer,
807807
MakeParamsBufferForSimpleView(GetDevice(), entry->textureView));
808-
mBindingData.bindings[info.params] = paramsBuffer;
809-
mBindingData.bufferData[info.params].offset = 0;
810-
mBindingData.bufferData[info.params].size = paramsBuffer->GetSize();
808+
mBindingData.bindings[info.metadata] = paramsBuffer;
809+
mBindingData.bufferData[info.metadata].offset = 0;
810+
mBindingData.bufferData[info.metadata].size = paramsBuffer->GetSize();
811811
return {};
812812
},
813813

‎src/dawn/native/BindGroupLayoutInternal.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ ExpandedBindingInfo ConvertAndExpandBGLEntries(
587587
struct ExternalTextureExpansion {
588588
BindingNumber plane0;
589589
BindingNumber plane1;
590-
BindingNumber params;
590+
BindingNumber metadata;
591591
};
592592
absl::flat_hash_map<BindingNumber, ExternalTextureExpansion> externalTextureExpansions;
593593

@@ -610,16 +610,16 @@ ExpandedBindingInfo ConvertAndExpandBGLEntries(
610610
entries.push_back(plane1Entry);
611611
internalEntries.insert(plane1Entry.binding);
612612

613-
BindingInfo paramsEntry = CreateUniformBindingForExternalTexture(
613+
BindingInfo metadataEntry = CreateUniformBindingForExternalTexture(
614614
nextOpenBindingNumberForNewEntryET++, entry->visibility);
615-
entries.push_back(paramsEntry);
616-
internalEntries.insert(paramsEntry.binding);
615+
entries.push_back(metadataEntry);
616+
internalEntries.insert(metadataEntry.binding);
617617

618618
externalTextureExpansions.insert({BindingNumber(entry->binding),
619619
{
620620
.plane0 = BindingNumber(plane0Entry.binding),
621621
.plane1 = BindingNumber(plane1Entry.binding),
622-
.params = BindingNumber(paramsEntry.binding),
622+
.metadata = BindingNumber(metadataEntry.binding),
623623
}});
624624
}
625625

@@ -665,7 +665,7 @@ ExpandedBindingInfo ConvertAndExpandBGLEntries(
665665
for (const auto& [etBindingNumber, expansion] : externalTextureExpansions) {
666666
auto& layout = entries[fullBindingMap[etBindingNumber]];
667667
layout.bindingLayout = ExternalTextureBindingInfo{{
668-
.params = fullBindingMap[expansion.params],
668+
.metadata = fullBindingMap[expansion.metadata],
669669
.plane0 = fullBindingMap[expansion.plane0],
670670
.plane1 = fullBindingMap[expansion.plane1],
671671
}};
@@ -941,7 +941,7 @@ size_t BindGroupLayoutInternalBase::ComputeContentHash() {
941941
recorder.Record(BindingInfoType::InputAttachment, layout.sampleType);
942942
},
943943
[&](const ExternalTextureBindingInfo& layout) {
944-
recorder.Record(BindingInfoType::ExternalTexture, layout.params, layout.plane0,
944+
recorder.Record(BindingInfoType::ExternalTexture, layout.metadata, layout.plane0,
945945
layout.plane1);
946946
});
947947
}

‎src/dawn/native/BindingInfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ DAWN_SERIALIZABLE(struct, SamplerBindingInfo, SAMPLER_BINDING_INFO_MEMBER) {
124124

125125
// The binding layout for ExternalTexture contains the indices of the expanded entries for it.
126126
#define EXTERNAL_TEXTURE_BINDING_INFO_MEMBER(X) \
127-
X(BindingIndex, params) \
127+
X(BindingIndex, metadata) \
128128
X(BindingIndex, plane0) \
129129
X(BindingIndex, plane1)
130130
DAWN_SERIALIZABLE(struct, ExternalTextureBindingInfo, EXTERNAL_TEXTURE_BINDING_INFO_MEMBER){};

‎src/dawn/native/d3d11/ShaderModuleD3D11.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ ResultOrError<d3d::CompiledShader> ShaderModule::Compile(
174174
bindings.external_texture.emplace(
175175
srcBindingPoint,
176176
tint::ExternalTexture{
177-
.metadata = ComputeDestinationBindingPoint(bindingInfo.params),
177+
.metadata = ComputeDestinationBindingPoint(bindingInfo.metadata),
178178
.plane0 = ComputeDestinationBindingPoint(bindingInfo.plane0),
179179
.plane1 = ComputeDestinationBindingPoint(bindingInfo.plane1)});
180180
},

‎src/dawn/native/d3d12/ShaderModuleD3D12.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ ResultOrError<d3d::CompiledShader> ShaderModule::Compile(
235235
bindings.external_texture.emplace(
236236
srcBindingPoint,
237237
tint::ExternalTexture{
238-
.metadata = ComputeDestinationBindingPoint(bindingInfo.params),
238+
.metadata = ComputeDestinationBindingPoint(bindingInfo.metadata),
239239
.plane0 = ComputeDestinationBindingPoint(bindingInfo.plane0),
240240
.plane1 = ComputeDestinationBindingPoint(bindingInfo.plane1)});
241241
},

‎src/dawn/native/metal/ShaderModuleMTL.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
bindings.external_texture.emplace(
194194
srcBindingPoint,
195195
tint::ExternalTexture{
196-
.metadata = ComputeDestinationBindingPoint(bindingInfo.params),
196+
.metadata = ComputeDestinationBindingPoint(bindingInfo.metadata),
197197
.plane0 = ComputeDestinationBindingPoint(bindingInfo.plane0),
198198
.plane1 = ComputeDestinationBindingPoint(bindingInfo.plane1)});
199199
},

‎src/dawn/native/opengl/ShaderModuleGL.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ tint::glsl::writer::Bindings GenerateBindingInfo(SingleShaderStage stage,
408408
bindings.external_texture.emplace(
409409
srcBindingPoint,
410410
tint::glsl::writer::ExternalTexture{
411-
.metadata = ComputeDestinationBindingPoint(bindingInfo.params),
411+
.metadata = ComputeDestinationBindingPoint(bindingInfo.metadata),
412412
.plane0 = ComputeDestinationBindingPoint(bindingInfo.plane0),
413413
.plane1 = ComputeDestinationBindingPoint(bindingInfo.plane1)});
414414
},

‎src/dawn/native/vulkan/ShaderModuleVk.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ ResultOrError<ShaderModule::ModuleAndSpirv> ShaderModule::GetHandleAndSpirv(
205205
bindings.external_texture.emplace(
206206
srcBindingPoint,
207207
tint::ExternalTexture{
208-
.metadata = ComputeDestinationBindingPoint(bindingInfo.params),
208+
.metadata = ComputeDestinationBindingPoint(bindingInfo.metadata),
209209
.plane0 = ComputeDestinationBindingPoint(bindingInfo.plane0),
210210
.plane1 = ComputeDestinationBindingPoint(bindingInfo.plane1)});
211211
},

0 commit comments

Comments
 (0)