Snap for 7485283 from 637b84a9d4409cfc5f916814b58cd8406f74944f to ndk-release-r23
Change-Id: I2cc254c6f78b2bf3ffce4f4825094885f1ab4d14
diff --git a/BUILD.gn b/BUILD.gn
index 7b40d1d..9fb5fb7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -28,7 +28,7 @@
"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 @@
"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/CHANGES b/CHANGES
index 83e8382..af95a60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,13 @@
Revision history for Shaderc
+v2021.0 2021-04-21
+ - Refresh dependencies (in DEPS):
+ - SPIRV-Tools v2021.1
+ - SPIRV-Headers snapshot 2021-04-21
+ - Glslang 11.2.0, snapshot 2021-04-21
+ - Fixes:
+ #1174: Windows Bazel support: rename internal headers io.* to io_shaderc.*
+
v2020.5 2021-02-19
- Refresh dependencies (in DEPS):
- SPIRV-Tools v2020.7 + 1 patch
diff --git a/DEPS b/DEPS
index 46f4e6e..c177661 100644
--- a/DEPS
+++ b/DEPS
@@ -5,11 +5,11 @@
'khronos_git': 'https://github.com/KhronosGroup',
'effcee_revision' : '2ec8f8738118cc483b67c04a759fee53496c5659',
- 'glslang_revision': 'e56beaee736863ce48455955158f1839e6e4c1a1',
+ 'glslang_revision': '60ce877de03ff03bb87fb9ef6b744ee33d076034',
'googletest_revision': '389cb68b87193358358ae87cc56d257fd0d80189',
're2_revision': '7107ebc4fbf7205151d8d2a57b2fc6e7853125d4',
- 'spirv_headers_revision': 'a3fdfe81465d57efc97cfd28ac6c8190fb31a6c8',
- 'spirv_tools_revision': 'ef3290bbea35935ba8fd623970511ed9f045bbd7',
+ 'spirv_headers_revision': 'dafead1765f6c1a5f9f8a76387dcb2abe4e54acd',
+ 'spirv_tools_revision': 'c2d5375fa7cc87c93f692e7200d5d974283d4391',
}
deps = {
diff --git a/glslc/src/dependency_info.cc b/glslc/src/dependency_info.cc
index 2622629..2f1ef2f 100644
--- a/glslc/src/dependency_info.cc
+++ b/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/glslc/src/file_compiler.cc b/glslc/src/file_compiler.cc
index 5d67be1..111b18b 100644
--- a/glslc/src/file_compiler.cc
+++ b/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/glslc/src/file_includer.cc b/glslc/src/file_includer.cc
index 448bfba..eab629b 100644
--- a/glslc/src/file_includer.cc
+++ b/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/glslc/src/main.cc b/glslc/src/main.cc
index 2b1c03e..c1467fe 100644
--- a/glslc/src/main.cc
+++ b/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/libshaderc_util/Android.mk b/libshaderc_util/Android.mk
index a694787..ade568c 100644
--- a/libshaderc_util/Android.mk
+++ b/libshaderc_util/Android.mk
@@ -21,7 +21,7 @@
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/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
index 48f9991..99ce3c4 100644
--- a/libshaderc_util/CMakeLists.txt
+++ b/libshaderc_util/CMakeLists.txt
@@ -18,7 +18,7 @@
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 @@
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 @@
string_piece
format
file_finder
- io
+ io_shaderc
message
mutex
version_profile)
@@ -85,5 +85,5 @@
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/libshaderc_util/include/libshaderc_util/io.h b/libshaderc_util/include/libshaderc_util/io_shaderc.h
similarity index 100%
rename from libshaderc_util/include/libshaderc_util/io.h
rename to libshaderc_util/include/libshaderc_util/io_shaderc.h
diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
index bf06589..051558b 100644
--- a/libshaderc_util/src/compiler.cc
+++ b/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/libshaderc_util/src/io.cc b/libshaderc_util/src/io_shaderc.cc
similarity index 98%
rename from libshaderc_util/src/io.cc
rename to libshaderc_util/src/io_shaderc.cc
index 42ae89d..dc2a53a 100644
--- a/libshaderc_util/src/io.cc
+++ b/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 @@
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/libshaderc_util/src/io_test.cc b/libshaderc_util/src/io_shaderc_test.cc
similarity index 97%
rename from libshaderc_util/src/io_test.cc
rename to libshaderc_util/src/io_shaderc_test.cc
index 0f605dc..638e15e 100644
--- a/libshaderc_util/src/io_test.cc
+++ b/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_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) {
diff --git a/license-checker.cfg b/license-checker.cfg
index 0e00206..7afc70d 100644
--- a/license-checker.cfg
+++ b/license-checker.cfg
@@ -1,6 +1,6 @@
[
{
- "licenses": [ "Apache-2.0-Header" ],
+ "licenses": [ "Apache-2.0" ],
"paths": [
{
"exclude": [
@@ -33,4 +33,4 @@
{ "include": [ "utils/git-sync-deps" ] }
]
}
-]
\ No newline at end of file
+]
