encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShaderModule: Keep the tint::Source::File alive 

Certain backends performs transformations on the tint::Program in the ShaderModule.
These transformations may raise diagnostics.
Tint diagnostics generated from an underlying tint::Source::File need that File kept alive.

Change-Id: I32deceb4cedb419e914631d342884fc27972b5cb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/50581
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Ben Clayton 2021-05-11 15:07:01 +00:00 committed by Commit Bot service account
parent e2f083e4b0
commit f0fdfa0d61
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dawn_native/ShaderModule.cpp
View File

@ -1050,7 +1050,7 @@ namespace dawn_native {
} }
// TintSource is a PIMPL container for a tint::Source::File, which needs to be kept alive for as // TintSource is a PIMPL container for a tint::Source::File, which needs to be kept alive for as
// long as tint diagnostics are inspected. // long as tint diagnostics are inspected / printed.
class TintSource { class TintSource {
public: public:
template <typename... ARGS> template <typename... ARGS>
@ -1070,9 +1070,8 @@ namespace dawn_native {
return DAWN_VALIDATION_ERROR("Shader module descriptor missing chained descriptor"); return DAWN_VALIDATION_ERROR("Shader module descriptor missing chained descriptor");
} }
// For now only a single SPIRV or WGSL subdescriptor is allowed. // For now only a single SPIRV or WGSL subdescriptor is allowed.
DAWN_TRY(ValidateSingleSType(chainedDescriptor, DAWN_TRY(ValidateSingleSType(chainedDescriptor, wgpu::SType::ShaderModuleSPIRVDescriptor,
wgpu::SType::ShaderModuleSPIRVDescriptor, wgpu::SType::ShaderModuleWGSLDescriptor));
wgpu::SType::ShaderModuleWGSLDescriptor));
OwnedCompilationMessages* outMessages = parseResult->compilationMessages.get(); OwnedCompilationMessages* outMessages = parseResult->compilationMessages.get();
@ -1114,8 +1113,8 @@ namespace dawn_native {
spirv_cfg.emit_vertex_point_size = true; spirv_cfg.emit_vertex_point_size = true;
transformInputs.Add<tint::transform::Spirv::Config>(spirv_cfg); transformInputs.Add<tint::transform::Spirv::Config>(spirv_cfg);
DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, &program, DAWN_TRY_ASSIGN(program, RunTransforms(&transformManager, &program, transformInputs,
transformInputs, nullptr, outMessages)); nullptr, outMessages));
std::vector<uint32_t> spirv; std::vector<uint32_t> spirv;
DAWN_TRY_ASSIGN(spirv, ModuleToSPIRV(&program)); DAWN_TRY_ASSIGN(spirv, ModuleToSPIRV(&program));
@ -1346,6 +1345,7 @@ namespace dawn_native {
MaybeError ShaderModuleBase::InitializeBase(ShaderModuleParseResult* parseResult) { MaybeError ShaderModuleBase::InitializeBase(ShaderModuleParseResult* parseResult) {
mTintProgram = std::move(parseResult->tintProgram); mTintProgram = std::move(parseResult->tintProgram);
mTintSource = std::move(parseResult->tintSource);
mSpirv = std::move(parseResult->spirv); mSpirv = std::move(parseResult->spirv);
mCompilationMessages = std::move(parseResult->compilationMessages); mCompilationMessages = std::move(parseResult->compilationMessages);

1
src/dawn_native/ShaderModule.h
View File

@ -203,6 +203,7 @@ namespace dawn_native {
EntryPointMetadataTable mEntryPoints; EntryPointMetadataTable mEntryPoints;
std::vector<uint32_t> mSpirv; std::vector<uint32_t> mSpirv;
std::unique_ptr<tint::Program> mTintProgram; std::unique_ptr<tint::Program> mTintProgram;
std::unique_ptr<TintSource> mTintSource; // Keep the tint::Source::File alive
std::unique_ptr<OwnedCompilationMessages> mCompilationMessages; std::unique_ptr<OwnedCompilationMessages> mCompilationMessages;
}; };