diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-01 11:08:40 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 12:16:21 +0000 |
commit | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (patch) | |
tree | fe49d170a929b34ba82cd10db1a0bd8e3760fa4b /chromium/third_party/shaderc | |
parent | 5d013f5804a0d91fcf6c626b2d6fb6eca5c845b0 (diff) | |
download | qtwebengine-chromium-03c549e0392f92c02536d3f86d5e1d8dfa3435ac.tar.gz |
BASELINE: Update Chromium to 91.0.4472.160
Change-Id: I0def1f08a2412aeed79a9ab95dd50eb5c3f65f31
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/shaderc')
11 files changed, 21 insertions, 21 deletions
diff --git a/chromium/third_party/shaderc/src/BUILD.gn b/chromium/third_party/shaderc/src/BUILD.gn index 7b40d1dd7fe..9fb5fb7acbf 100644 --- a/chromium/third_party/shaderc/src/BUILD.gn +++ b/chromium/third_party/shaderc/src/BUILD.gn @@ -28,7 +28,7 @@ source_set("shaderc_util_sources") { "libshaderc_util/include/libshaderc_util/exceptions.h", "libshaderc_util/include/libshaderc_util/file_finder.h", "libshaderc_util/include/libshaderc_util/format.h", - "libshaderc_util/include/libshaderc_util/io.h", + "libshaderc_util/include/libshaderc_util/io_shaderc.h", "libshaderc_util/include/libshaderc_util/message.h", "libshaderc_util/include/libshaderc_util/mutex.h", "libshaderc_util/include/libshaderc_util/resources.h", @@ -38,7 +38,7 @@ source_set("shaderc_util_sources") { "libshaderc_util/include/libshaderc_util/version_profile.h", "libshaderc_util/src/compiler.cc", "libshaderc_util/src/file_finder.cc", - "libshaderc_util/src/io.cc", + "libshaderc_util/src/io_shaderc.cc", "libshaderc_util/src/message.cc", "libshaderc_util/src/resources.cc", "libshaderc_util/src/shader_stage.cc", diff --git a/chromium/third_party/shaderc/src/glslc/src/dependency_info.cc b/chromium/third_party/shaderc/src/glslc/src/dependency_info.cc index 26226291e96..2f1ef2f4a44 100644 --- a/chromium/third_party/shaderc/src/glslc/src/dependency_info.cc +++ b/chromium/third_party/shaderc/src/glslc/src/dependency_info.cc @@ -19,7 +19,7 @@ #include <sstream> #include "file.h" -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" namespace glslc { diff --git a/chromium/third_party/shaderc/src/glslc/src/file_compiler.cc b/chromium/third_party/shaderc/src/glslc/src/file_compiler.cc index 5d67be1b5b2..111b18b5ad7 100644 --- a/chromium/third_party/shaderc/src/glslc/src/file_compiler.cc +++ b/chromium/third_party/shaderc/src/glslc/src/file_compiler.cc @@ -28,7 +28,7 @@ #include "file_includer.h" #include "shader_stage.h" -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" #include "libshaderc_util/message.h" namespace { diff --git a/chromium/third_party/shaderc/src/glslc/src/file_includer.cc b/chromium/third_party/shaderc/src/glslc/src/file_includer.cc index 448bfba5485..eab629b2a8a 100644 --- a/chromium/third_party/shaderc/src/glslc/src/file_includer.cc +++ b/chromium/third_party/shaderc/src/glslc/src/file_includer.cc @@ -17,7 +17,7 @@ #include <mutex> #include <utility> -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" namespace glslc { diff --git a/chromium/third_party/shaderc/src/glslc/src/main.cc b/chromium/third_party/shaderc/src/glslc/src/main.cc index 2b1c03edbc9..c1467fefc42 100644 --- a/chromium/third_party/shaderc/src/glslc/src/main.cc +++ b/chromium/third_party/shaderc/src/glslc/src/main.cc @@ -28,7 +28,7 @@ #include "file_compiler.h" #include "libshaderc_util/args.h" #include "libshaderc_util/compiler.h" -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" #include "libshaderc_util/string_piece.h" #include "resource_parse.h" #include "shader_stage.h" diff --git a/chromium/third_party/shaderc/src/libshaderc_util/Android.mk b/chromium/third_party/shaderc/src/libshaderc_util/Android.mk index a694787dbdc..ade568ca316 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/Android.mk +++ b/chromium/third_party/shaderc/src/libshaderc_util/Android.mk @@ -21,7 +21,7 @@ LOCAL_EXPORT_C_INCLUDES:=$(LOCAL_PATH)/include LOCAL_SRC_FILES:=src/args.cc \ src/compiler.cc \ src/file_finder.cc \ - src/io.cc \ + src/io_shaderc.cc \ src/message.cc \ src/resources.cc \ src/shader_stage.cc \ diff --git a/chromium/third_party/shaderc/src/libshaderc_util/CMakeLists.txt b/chromium/third_party/shaderc/src/libshaderc_util/CMakeLists.txt index 48f99912ff3..99ce3c44e44 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/CMakeLists.txt +++ b/chromium/third_party/shaderc/src/libshaderc_util/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(shaderc_util STATIC include/libshaderc_util/counting_includer.h include/libshaderc_util/file_finder.h include/libshaderc_util/format.h - include/libshaderc_util/io.h + include/libshaderc_util/io_shaderc.h include/libshaderc_util/mutex.h include/libshaderc_util/message.h include/libshaderc_util/resources.h @@ -29,7 +29,7 @@ add_library(shaderc_util STATIC src/args.cc src/compiler.cc src/file_finder.cc - src/io.cc + src/io_shaderc.cc src/message.cc src/resources.cc src/shader_stage.cc @@ -57,7 +57,7 @@ shaderc_add_tests( string_piece format file_finder - io + io_shaderc message mutex version_profile) @@ -85,5 +85,5 @@ add_custom_target(testdata COMMAND if(${SHADERC_ENABLE_TESTS}) add_dependencies(shaderc_util_file_finder_test testdata) - add_dependencies(shaderc_util_io_test testdata) + add_dependencies(shaderc_util_io_shaderc_test testdata) endif() diff --git a/chromium/third_party/shaderc/src/libshaderc_util/include/libshaderc_util/io.h b/chromium/third_party/shaderc/src/libshaderc_util/include/libshaderc_util/io_shaderc.h index b9116c11e3f..b9116c11e3f 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/include/libshaderc_util/io.h +++ b/chromium/third_party/shaderc/src/libshaderc_util/include/libshaderc_util/io_shaderc.h diff --git a/chromium/third_party/shaderc/src/libshaderc_util/src/compiler.cc b/chromium/third_party/shaderc/src/libshaderc_util/src/compiler.cc index bf065895c89..051558b581f 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/src/compiler.cc +++ b/chromium/third_party/shaderc/src/libshaderc_util/src/compiler.cc @@ -22,7 +22,7 @@ #include "SPIRV/GlslangToSpv.h" #include "libshaderc_util/format.h" -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" #include "libshaderc_util/message.h" #include "libshaderc_util/resources.h" #include "libshaderc_util/shader_stage.h" diff --git a/chromium/third_party/shaderc/src/libshaderc_util/src/io.cc b/chromium/third_party/shaderc/src/libshaderc_util/src/io_shaderc.cc index 42ae89d25e3..dc2a53af9d8 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/src/io.cc +++ b/chromium/third_party/shaderc/src/libshaderc_util/src/io_shaderc.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "libshaderc_util/io.h" +#include "libshaderc_util/io_shaderc.h" #include "libshaderc_util/universal_unistd.h" @@ -24,6 +24,7 @@ #endif #include <errno.h> + #include <cstdio> #include <cstring> #include <fstream> @@ -105,7 +106,7 @@ std::ostream* GetOutputStream(const string_piece& output_filename, stream = file_stream; if (file_stream->fail()) { *err << "glslc: error: cannot open output file: '" << output_filename - << "'"; + << "'"; if (access(output_filename.str().c_str(), W_OK) != 0) { OutputFileErrorMessage(errno); return nullptr; diff --git a/chromium/third_party/shaderc/src/libshaderc_util/src/io_test.cc b/chromium/third_party/shaderc/src/libshaderc_util/src/io_shaderc_test.cc index 0f605dc4dd9..638e15e45de 100644 --- a/chromium/third_party/shaderc/src/libshaderc_util/src/io_test.cc +++ b/chromium/third_party/shaderc/src/libshaderc_util/src/io_shaderc_test.cc @@ -12,19 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "libshaderc_util/io.h" - -#include <fstream> +#include "libshaderc_util/io_shaderc.h" #include <gmock/gmock.h> +#include <fstream> + namespace { +using shaderc_util::GetBaseFileName; +using shaderc_util::GetOutputStream; using shaderc_util::IsAbsolutePath; using shaderc_util::ReadFile; using shaderc_util::WriteFile; -using shaderc_util::GetOutputStream; -using shaderc_util::GetBaseFileName; using testing::Eq; using testing::HasSubstr; @@ -90,8 +90,7 @@ TEST(GetBaseFileName, Windows) { TEST_F(ReadFileTest, CorrectContent) { ASSERT_TRUE(ReadFile("include_file.1", &read_data)); - EXPECT_EQ("The quick brown fox jumps over a lazy dog.", - ToString(read_data)); + EXPECT_EQ("The quick brown fox jumps over a lazy dog.", ToString(read_data)); } TEST_F(ReadFileTest, EmptyContent) { |