commit 001b499275e1354cc1198f5e7a50509aabe28be7
author Ryan Harrison <rharrison@chromium.org> Thu Jan 21 16:17:31 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Jan 21 16:17:31 2021 +0000
tree 26b750707ad5db1b3a0bb05080614e65e784827c
parent c2032ea6371d85d8d8e739b6cc82df6afbde0518

Adding stage input/output reflection to inspector path

BUG=dawn:578

Change-Id: I15d0c9df81c606ea0def1a2d3fc550224f7dcfd8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/38320
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

src/dawn_native/ShaderModule.cpp

diff --git a/src/dawn_native/ShaderModule.cpp b/src/dawn_native/ShaderModule.cpp
index a001569..1975f1e 100644
--- a/src/dawn_native/ShaderModule.cpp
+++ b/src/dawn_native/ShaderModule.cpp
@@ -329,7 +329,7 @@
             return std::move(result);
         }
 
-        MaybeError ValidateCompatibilityWithBindGroupLayout(DeviceBase* device,
+        MaybeError ValidateCompatibilityWithBindGroupLayout(DeviceBase*,
                                                             BindGroupIndex group,
                                                             const EntryPointMetadata& entryPoint,
                                                             const BindGroupLayoutBase* layout) {
@@ -691,7 +691,7 @@
         // this function is complete, ReflectShaderUsingSPIRVCross and
         // PopulateMetadataUsingSPIRVCross will be removed.
         ResultOrError<EntryPointMetadataTable> ReflectShaderUsingTint(
-            DeviceBase* device,
+            DeviceBase*,
             const tint::ast::Module& module) {
             ASSERT(module.IsValid());
 
@@ -710,10 +710,35 @@
                 ASSERT(result.count(entryPoint.name) == 0);
 
                 auto metadata = std::make_unique<EntryPointMetadata>();
+
                 metadata->stage = PipelineStateToShaderStage(entryPoint.stage);
-                metadata->localWorkgroupSize.x = entryPoint.workgroup_size_x;
-                metadata->localWorkgroupSize.y = entryPoint.workgroup_size_y;
-                metadata->localWorkgroupSize.z = entryPoint.workgroup_size_z;
+
+                if (metadata->stage == SingleShaderStage::Vertex) {
+                    for (auto& stage_input : entryPoint.input_variables) {
+                        if (!stage_input.has_location_decoration) {
+                            return DAWN_VALIDATION_ERROR(
+                                "Need Location decoration on Vertex input");
+                        }
+                        uint32_t location = stage_input.location_decoration;
+                        if (location >= kMaxVertexAttributes) {
+                            return DAWN_VALIDATION_ERROR("Attribute location over limits");
+                        }
+                        metadata->usedVertexAttributes.set(location);
+                    }
+
+                    for (auto& stage_output : entryPoint.output_variables) {
+                        if (!stage_output.has_location_decoration) {
+                            return DAWN_VALIDATION_ERROR(
+                                "Need Location decoration on Vertex output");
+                        }
+                    }
+                }
+
+                if (metadata->stage == SingleShaderStage::Compute) {
+                    metadata->localWorkgroupSize.x = entryPoint.workgroup_size_x;
+                    metadata->localWorkgroupSize.y = entryPoint.workgroup_size_y;
+                    metadata->localWorkgroupSize.z = entryPoint.workgroup_size_z;
+                }
 
                 result[entryPoint.name] = std::move(metadata);
             }
@@ -774,16 +799,26 @@
                         "Tint and SPIRV-Cross returned different stages for entry point");
                 }
 
-                if (tintEntry->localWorkgroupSize.x != tintEntry->localWorkgroupSize.x ||
-                    tintEntry->localWorkgroupSize.y != tintEntry->localWorkgroupSize.y ||
-                    tintEntry->localWorkgroupSize.z != tintEntry->localWorkgroupSize.z) {
-                    return DAWN_VALIDATION_ERROR(
-                        "Tint and SPIRV-Cross returned different values for local workgroup size");
+                if (tintEntry->stage == SingleShaderStage::Vertex) {
+                    if (tintEntry->usedVertexAttributes != crossEntry->usedVertexAttributes) {
+                        return DAWN_VALIDATION_ERROR(
+                            "Tint and SPIRV-Cross returned different used vertex attributes for "
+                            "entry point");
+                    }
+                }
+
+                if (tintEntry->stage == SingleShaderStage::Compute) {
+                    if (tintEntry->localWorkgroupSize.x != crossEntry->localWorkgroupSize.x ||
+                        tintEntry->localWorkgroupSize.y != crossEntry->localWorkgroupSize.y ||
+                        tintEntry->localWorkgroupSize.z != crossEntry->localWorkgroupSize.z) {
+                        return DAWN_VALIDATION_ERROR(
+                            "Tint and SPIRV-Cross returned different values for local workgroup "
+                            "size");
+                    }
                 }
 
                 // TODO(rharrison): Use the Inspector to get this data.
                 tintEntry->bindings = crossEntry->bindings;
-                tintEntry->usedVertexAttributes = crossEntry->usedVertexAttributes;
                 tintEntry->fragmentOutputFormatBaseTypes =
                     crossEntry->fragmentOutputFormatBaseTypes;
                 tintEntry->fragmentOutputsWritten = crossEntry->fragmentOutputsWritten;