From a6222d2c5b995fc79107ad11da0f4326c5b58249 Mon Sep 17 00:00:00 2001 From: Dawn Autoroller Date: Mon, 31 Jan 2022 07:35:21 +0000 Subject: [PATCH] Roll Tint from 3cdb8e3c3e0a to 0b39270e01ce (8 revisions) Also contains a fix for src/dawn_native/CompilationMessages.cpp, where the tint::Source structure has changed in a breaking way. https://dawn.googlesource.com/tint.git/+log/3cdb8e3c3e0a..0b39270e01ce Bug: None Change-Id: If801fa85200316012916b24324fd39d275d1fd2f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/78720 Auto-Submit: Ben Clayton Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez --- DEPS | 2 +- src/dawn_native/CompilationMessages.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index d65a5afbc0..40d6615ffe 100644 --- a/DEPS +++ b/DEPS @@ -113,7 +113,7 @@ deps = { # WGSL support 'third_party/tint': { - 'url': '{dawn_git}/tint@3cdb8e3c3e0a8affa648d5a5031d5ff9f35633f9', + 'url': '{dawn_git}/tint@0b39270e01ce2327dd8c01d8d7192e823cec4424', }, # GLFW for tests and samples diff --git a/src/dawn_native/CompilationMessages.cpp b/src/dawn_native/CompilationMessages.cpp index aaac193156..75833ebded 100644 --- a/src/dawn_native/CompilationMessages.cpp +++ b/src/dawn_native/CompilationMessages.cpp @@ -67,8 +67,8 @@ namespace dawn::native { uint64_t offset = 0; uint64_t length = 0; - if (lineNum && linePos && diagnostic.source.file_content) { - const auto& lines = diagnostic.source.file_content->lines; + if (lineNum && linePos && diagnostic.source.file) { + const auto& lines = diagnostic.source.file->content.lines; size_t i = 0; // To find the offset of the message position, loop through each of the first lineNum-1 // lines and add it's length (+1 to account for the line break) to the offset.