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

Add ifdefs for Tint API usage that may not be available 

Fixed Kokoro failures when building Tint with all readers and writers
disabled.

Change-Id: I9bd041339236488dd563bbe687da883035f2a4b7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86181
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Antonio Maiorano 2022-04-11 15:21:41 +00:00 committed by Dawn LUCI CQ
parent a3b3b43162
commit e0bee791cb
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dawn/native/ShaderModule.cpp
View File

@ -380,6 +380,7 @@ namespace dawn::native {
ResultOrError<tint::Program> ParseWGSL(const tint::Source::File* file, ResultOrError<tint::Program> ParseWGSL(const tint::Source::File* file,
OwnedCompilationMessages* outMessages) { OwnedCompilationMessages* outMessages) {
#if TINT_BUILD_WGSL_READER
tint::Program program = tint::reader::wgsl::Parse(file); tint::Program program = tint::reader::wgsl::Parse(file);
if (outMessages != nullptr) { if (outMessages != nullptr) {
outMessages->AddMessages(program.Diagnostics()); outMessages->AddMessages(program.Diagnostics());
@ -391,10 +392,14 @@ namespace dawn::native {
} }
return std::move(program); return std::move(program);
#else
return DAWN_FORMAT_VALIDATION_ERROR("TINT_BUILD_WGSL_READER is not defined.");
#endif
} }
ResultOrError<tint::Program> ParseSPIRV(const std::vector<uint32_t>& spirv, ResultOrError<tint::Program> ParseSPIRV(const std::vector<uint32_t>& spirv,
OwnedCompilationMessages* outMessages) { OwnedCompilationMessages* outMessages) {
#if TINT_BUILD_SPV_READER
tint::Program program = tint::reader::spirv::Parse(spirv); tint::Program program = tint::reader::spirv::Parse(spirv);
if (outMessages != nullptr) { if (outMessages != nullptr) {
outMessages->AddMessages(program.Diagnostics()); outMessages->AddMessages(program.Diagnostics());
@ -405,6 +410,10 @@ namespace dawn::native {
} }
return std::move(program); return std::move(program);
#else
return DAWN_FORMAT_VALIDATION_ERROR("TINT_BUILD_SPV_READER is not defined.");
#endif
} }
std::vector<uint64_t> GetBindGroupMinBufferSizes(const BindingGroupInfoMap& shaderBindings, std::vector<uint64_t> GetBindGroupMinBufferSizes(const BindingGroupInfoMap& shaderBindings,
@ -997,6 +1006,7 @@ namespace dawn::native {
ShaderModuleWGSLDescriptor newWgslDesc; ShaderModuleWGSLDescriptor newWgslDesc;
std::string newWgslCode; std::string newWgslCode;
if (spirvDesc && device->IsToggleEnabled(Toggle::ForceWGSLStep)) { if (spirvDesc && device->IsToggleEnabled(Toggle::ForceWGSLStep)) {
#if TINT_BUILD_WGSL_WRITER
std::vector<uint32_t> spirv(spirvDesc->code, spirvDesc->code + spirvDesc->codeSize); std::vector<uint32_t> spirv(spirvDesc->code, spirvDesc->code + spirvDesc->codeSize);
tint::Program program; tint::Program program;
DAWN_TRY_ASSIGN(program, ParseSPIRV(spirv, outMessages)); DAWN_TRY_ASSIGN(program, ParseSPIRV(spirv, outMessages));
@ -1010,6 +1020,11 @@ namespace dawn::native {
spirvDesc = nullptr; spirvDesc = nullptr;
wgslDesc = &newWgslDesc; wgslDesc = &newWgslDesc;
#else
device->EmitLog(
WGPULoggingType_Info,
"Toggle::ForceWGSLStep skipped because TINT_BUILD_WGSL_WRITER is not defined\n");
#endif
} }
if (spirvDesc) { if (spirvDesc) {

4
src/dawn/native/vulkan/ShaderModuleVk.cpp
View File

@ -203,6 +203,7 @@ namespace dawn::native::vulkan {
transformInputs, nullptr, nullptr)); transformInputs, nullptr, nullptr));
} }
#if TINT_BUILD_SPV_WRITER
tint::writer::spirv::Options options; tint::writer::spirv::Options options;
options.emit_vertex_point_size = true; options.emit_vertex_point_size = true;
options.disable_workgroup_init = GetDevice()->IsToggleEnabled(Toggle::DisableWorkgroupInit); options.disable_workgroup_init = GetDevice()->IsToggleEnabled(Toggle::DisableWorkgroupInit);
@ -249,6 +250,9 @@ namespace dawn::native::vulkan {
GetLabel()); GetLabel());
return std::move(moduleAndSpirv); return std::move(moduleAndSpirv);
#else
return DAWN_INTERNAL_ERROR("TINT_BUILD_SPV_WRITER is not defined.");
#endif
} }
} // namespace dawn::native::vulkan } // namespace dawn::native::vulkan