Remove deprecated inspector fields.

This CL removes two deprecated fields from the inspector. The deprecated
alias to sem::SamplerTexturePair remains as it will require creating a
structure on the inspector side to replicate.

Change-Id: I6001fbd475260079dd49d50f8e8619241bb0b468
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/120880
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
dan sinclair
2023-02-21 21:54:48 +00:00
committed by Dawn LUCI CQ
parent fdef033210
commit 2f689a7efe
5 changed files with 12 additions and 23 deletions

View File

@@ -567,7 +567,7 @@ ResultOrError<std::unique_ptr<EntryPointMetadata>> ReflectEntryPointUsingTint(
const uint32_t maxInterStageShaderComponents = limits.v1.maxInterStageShaderComponents;
if (metadata->stage == SingleShaderStage::Vertex) {
for (const auto& inputVar : entryPoint.input_variables) {
uint32_t unsanitizedLocation = inputVar.location_decoration;
uint32_t unsanitizedLocation = inputVar.location_attribute;
if (DelayedInvalidIf(unsanitizedLocation >= maxVertexAttributes,
"Vertex input variable \"%s\" has a location (%u) that "
"exceeds the maximum (%u)",
@@ -595,7 +595,7 @@ ResultOrError<std::unique_ptr<EntryPointMetadata>> ReflectEntryPointUsingTint(
outputVar.interpolation_sampling));
totalInterStageShaderComponents += variable.componentCount;
uint32_t location = outputVar.location_decoration;
uint32_t location = outputVar.location_attribute;
if (DelayedInvalidIf(location >= maxInterStageShaderVariables,
"Vertex output variable \"%s\" has a location (%u) that "
"is greater than or equal to (%u).",
@@ -628,7 +628,7 @@ ResultOrError<std::unique_ptr<EntryPointMetadata>> ReflectEntryPointUsingTint(
inputVar.interpolation_sampling));
totalInterStageShaderComponents += variable.componentCount;
uint32_t location = inputVar.location_decoration;
uint32_t location = inputVar.location_attribute;
if (DelayedInvalidIf(location >= maxInterStageShaderVariables,
"Fragment input variable \"%s\" has a location (%u) that "
"is greater than or equal to (%u).",
@@ -666,7 +666,7 @@ ResultOrError<std::unique_ptr<EntryPointMetadata>> ReflectEntryPointUsingTint(
outputVar.composition_type));
ASSERT(variable.componentCount <= 4);
uint32_t unsanitizedAttachment = outputVar.location_decoration;
uint32_t unsanitizedAttachment = outputVar.location_attribute;
if (DelayedInvalidIf(unsanitizedAttachment >= maxColorAttachments,
"Fragment output variable \"%s\" has a location (%u) that "
"exceeds the maximum (%u).",