encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-14 00:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding stage input/output reflection to inspector path

Browse Source 
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>
This commit is contained in:
Ryan Harrison 2021-01-21 16:17:31 +00:00 committed by Commit Bot service account
parent c2032ea637
commit 001b499275
1 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/dawn_native/ShaderModule.cpp
View File

@ -329,7 +329,7 @@ namespace dawn_native {
return std::move(result); return std::move(result);
} }
MaybeError ValidateCompatibilityWithBindGroupLayout(DeviceBase* device, MaybeError ValidateCompatibilityWithBindGroupLayout(DeviceBase*,
BindGroupIndex group, BindGroupIndex group,
const EntryPointMetadata& entryPoint, const EntryPointMetadata& entryPoint,
const BindGroupLayoutBase* layout) { const BindGroupLayoutBase* layout) {
@ -691,7 +691,7 @@ namespace dawn_native {
// this function is complete, ReflectShaderUsingSPIRVCross and // this function is complete, ReflectShaderUsingSPIRVCross and
// PopulateMetadataUsingSPIRVCross will be removed. // PopulateMetadataUsingSPIRVCross will be removed.
ResultOrError<EntryPointMetadataTable> ReflectShaderUsingTint( ResultOrError<EntryPointMetadataTable> ReflectShaderUsingTint(
DeviceBase* device, DeviceBase*,
const tint::ast::Module& module) { const tint::ast::Module& module) {
ASSERT(module.IsValid()); ASSERT(module.IsValid());
@ -710,10 +710,35 @@ namespace dawn_native {
ASSERT(result.count(entryPoint.name) == 0); ASSERT(result.count(entryPoint.name) == 0);
auto metadata = std::make_unique<EntryPointMetadata>(); auto metadata = std::make_unique<EntryPointMetadata>();
metadata->stage = PipelineStateToShaderStage(entryPoint.stage); metadata->stage = PipelineStateToShaderStage(entryPoint.stage);
metadata->localWorkgroupSize.x = entryPoint.workgroup_size_x;
metadata->localWorkgroupSize.y = entryPoint.workgroup_size_y; if (metadata->stage == SingleShaderStage::Vertex) {
metadata->localWorkgroupSize.z = entryPoint.workgroup_size_z; 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); result[entryPoint.name] = std::move(metadata);
} }
@ -774,16 +799,26 @@ namespace dawn_native {
"Tint and SPIRV-Cross returned different stages for entry point"); "Tint and SPIRV-Cross returned different stages for entry point");
} }
if (tintEntry->localWorkgroupSize.x != tintEntry->localWorkgroupSize.x || if (tintEntry->stage == SingleShaderStage::Vertex) {
tintEntry->localWorkgroupSize.y != tintEntry->localWorkgroupSize.y || if (tintEntry->usedVertexAttributes != crossEntry->usedVertexAttributes) {
tintEntry->localWorkgroupSize.z != tintEntry->localWorkgroupSize.z) { return DAWN_VALIDATION_ERROR(
return DAWN_VALIDATION_ERROR( "Tint and SPIRV-Cross returned different used vertex attributes for "
"Tint and SPIRV-Cross returned different values for local workgroup size"); "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. // TODO(rharrison): Use the Inspector to get this data.
tintEntry->bindings = crossEntry->bindings; tintEntry->bindings = crossEntry->bindings;
tintEntry->usedVertexAttributes = crossEntry->usedVertexAttributes;
tintEntry->fragmentOutputFormatBaseTypes = tintEntry->fragmentOutputFormatBaseTypes =
crossEntry->fragmentOutputFormatBaseTypes; crossEntry->fragmentOutputFormatBaseTypes;
tintEntry->fragmentOutputsWritten = crossEntry->fragmentOutputsWritten; tintEntry->fragmentOutputsWritten = crossEntry->fragmentOutputsWritten;