aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Adrian <davidcadrian@gmail.com>2021-03-03 21:17:13 -0700
committerDavid Neto <dneto@google.com>2021-03-15 14:55:33 -0400
commitca84dcaad6cc16b051bbbb1c099d1d31c2285945 (patch)
treeda8a3c818d48236d118820a4d9de48654774a7f9
parent01dd72d6079ebdc0f96859365ba7abb1b62758bf (diff)
downloadshaderc-ca84dcaad6cc16b051bbbb1c099d1d31c2285945.tar.gz
Rename io.h to io_shaderc.h
This makes libshaderc possible to compile on Windows under Bazel, due to https://github.com/bazelbuild/bazel/issues/11672.
-rw-r--r--glslc/src/dependency_info.cc2
-rw-r--r--glslc/src/file_compiler.cc2
-rw-r--r--glslc/src/file_includer.cc2
-rw-r--r--glslc/src/main.cc2
-rw-r--r--libshaderc_util/CMakeLists.txt2
-rw-r--r--libshaderc_util/include/libshaderc_util/io_shaderc.h (renamed from libshaderc_util/include/libshaderc_util/io.h)0
-rw-r--r--libshaderc_util/src/compiler.cc2
-rw-r--r--libshaderc_util/src/io.cc2
-rw-r--r--libshaderc_util/src/io_test.cc2
9 files changed, 8 insertions, 8 deletions
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/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
index 48f9991..56d1fa1 100644
--- a/libshaderc_util/CMakeLists.txt
+++ b/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
diff --git a/libshaderc_util/include/libshaderc_util/io.h b/libshaderc_util/include/libshaderc_util/io_shaderc.h
index b9116c1..b9116c1 100644
--- a/libshaderc_util/include/libshaderc_util/io.h
+++ b/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.cc
index 42ae89d..a278d49 100644
--- a/libshaderc_util/src/io.cc
+++ b/libshaderc_util/src/io.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"
diff --git a/libshaderc_util/src/io_test.cc b/libshaderc_util/src/io_test.cc
index 0f605dc..45957c4 100644
--- a/libshaderc_util/src/io_test.cc
+++ b/libshaderc_util/src/io_test.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 <fstream>