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

Metal: Generate storage buffer lengths with Tint

Browse Source 
Tint now matches the behavior of spirv-cross for shaders to use the
arrayLength builtin, and so needs a uniform buffer containing storage
buffer lengths to be passed to shaders that use this builtin.

Fixed: tint:256
Change-Id: Ib51cc4a3c6f7c2cdea867a23ed868d9d3740d734
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/55181
Auto-Submit: James Price <jrprice@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
James Price 2021-06-21 20:08:18 +00:00 committed by Dawn LUCI CQ
parent f2d1d55e99
commit 3a1a0397d3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dawn_native/metal/ShaderModuleMTL.mm
View File

@ -61,9 +61,6 @@ namespace dawn_native { namespace metal {
const VertexState* vertexState, const VertexState* vertexState,
std::string* remappedEntryPointName, std::string* remappedEntryPointName,
bool* needsStorageBufferLength) { bool* needsStorageBufferLength) {
// TODO(crbug.com/tint/256): Set this accordingly if arrayLength(..) is used.
*needsStorageBufferLength = false;
ScopedTintICEHandler scopedICEHandler(GetDevice()); ScopedTintICEHandler scopedICEHandler(GetDevice());
std::ostringstream errorStream; std::ostringstream errorStream;
@ -133,6 +130,8 @@ namespace dawn_native { namespace metal {
std::move(accessControls), std::move(accessControls),
/* mayCollide */ true); /* mayCollide */ true);
transformInputs.Add<tint::transform::Msl::Config>(kBufferLengthBufferSlot);
tint::Program program; tint::Program program;
tint::transform::DataMap transformOutputs; tint::transform::DataMap transformOutputs;
DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, GetTintProgram(), transformInputs, DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, GetTintProgram(), transformInputs,
@ -148,6 +147,12 @@ namespace dawn_native { namespace metal {
return DAWN_VALIDATION_ERROR("Transform output missing renamer data."); return DAWN_VALIDATION_ERROR("Transform output missing renamer data.");
} }
if (auto* data = transformOutputs.Get<tint::transform::Msl::Result>()) {
*needsStorageBufferLength = data->needs_storage_buffer_sizes;
} else {
return DAWN_VALIDATION_ERROR("Transform output missing MSL data.");
}
tint::writer::msl::Generator generator(&program); tint::writer::msl::Generator generator(&program);
if (!generator.Generate()) { if (!generator.Generate()) {
errorStream << "Generator: " << generator.error() << std::endl; errorStream << "Generator: " << generator.error() << std::endl;