74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
|
From eb3e5917134ec42590e6a27dea7b75b870b22d38 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
|
||
|
|
Date: Sun, 2 Feb 2020 23:03:53 +0100
|
||
|
|
Subject: [PATCH] Fix SPIRV includes location
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
SPIRV includes have been moved under glslang/ in the latest version.
|
||
|
|
|
||
|
|
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
|
||
|
|
---
|
||
|
|
libshaderc/src/shaderc.cc | 2 +-
|
||
|
|
libshaderc/src/shaderc_cpp_test.cc | 2 +-
|
||
|
|
libshaderc/src/shaderc_test.cc | 2 +-
|
||
|
|
libshaderc_util/src/compiler.cc | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
|
||
|
|
index fe57c76..82c47ef 100644
|
||
|
|
--- a/libshaderc/src/shaderc.cc
|
||
|
|
+++ b/libshaderc/src/shaderc.cc
|
||
|
|
@@ -20,7 +20,7 @@
|
||
|
|
#include <sstream>
|
||
|
|
#include <vector>
|
||
|
|
|
||
|
|
-#include "SPIRV/spirv.hpp"
|
||
|
|
+#include "glslang/SPIRV/spirv.hpp"
|
||
|
|
|
||
|
|
#include "libshaderc_util/compiler.h"
|
||
|
|
#include "libshaderc_util/counting_includer.h"
|
||
|
|
diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc
|
||
|
|
index 407d8f4..addb347 100644
|
||
|
|
--- a/libshaderc/src/shaderc_cpp_test.cc
|
||
|
|
+++ b/libshaderc/src/shaderc_cpp_test.cc
|
||
|
|
@@ -18,7 +18,7 @@
|
||
|
|
#include <thread>
|
||
|
|
#include <unordered_map>
|
||
|
|
|
||
|
|
-#include "SPIRV/spirv.hpp"
|
||
|
|
+#include "glslang/SPIRV/spirv.hpp"
|
||
|
|
#include "spirv-tools/libspirv.hpp"
|
||
|
|
|
||
|
|
#include "common_shaders_for_test.h"
|
||
|
|
diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc
|
||
|
|
index a54b87c..cab5224 100644
|
||
|
|
--- a/libshaderc/src/shaderc_test.cc
|
||
|
|
+++ b/libshaderc/src/shaderc_test.cc
|
||
|
|
@@ -18,7 +18,7 @@
|
||
|
|
#include <thread>
|
||
|
|
#include <unordered_map>
|
||
|
|
|
||
|
|
-#include "SPIRV/spirv.hpp"
|
||
|
|
+#include "glslang/SPIRV/spirv.hpp"
|
||
|
|
|
||
|
|
#include "common_shaders_for_test.h"
|
||
|
|
#include "shaderc/shaderc.h"
|
||
|
|
diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
|
||
|
|
index 1809eab..a485b12 100644
|
||
|
|
--- a/libshaderc_util/src/compiler.cc
|
||
|
|
+++ b/libshaderc_util/src/compiler.cc
|
||
|
|
@@ -19,7 +19,7 @@
|
||
|
|
#include <sstream>
|
||
|
|
#include <tuple>
|
||
|
|
|
||
|
|
-#include "SPIRV/GlslangToSpv.h"
|
||
|
|
+#include "glslang/SPIRV/GlslangToSpv.h"
|
||
|
|
#include "libshaderc_util/format.h"
|
||
|
|
#include "libshaderc_util/io.h"
|
||
|
|
#include "libshaderc_util/message.h"
|
||
|
|
--
|
||
|
|
2.24.1
|
||
|
|
|