encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the agreed upon include path for spirv-cross. 

Everyone using spirv-cross includes its headers via <spirv_msl.hpp> for
example. Make Dawn match that convention so it can play better with the
setup used by other projects.

Still leave <spirv-cross/spirv_msl.hpp> working for now because it is
used by shaderc_spvc. A follow up CL to that repo will do the same
change.

BUG=

Change-Id: I9dc590a809d7ba733113b07930a285acfca64a66
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/10801
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2019-09-04 08:47:14 +00:00 committed by Commit Bot service account
parent ce2adba679
commit f5c44772a6
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dawn_native/ShaderModule.cpp
View File

@ -20,8 +20,8 @@
#include "dawn_native/Pipeline.h" #include "dawn_native/Pipeline.h"
#include "dawn_native/PipelineLayout.h" #include "dawn_native/PipelineLayout.h"
#include <spirv-cross/spirv_cross.hpp>
#include <spirv-tools/libspirv.hpp> #include <spirv-tools/libspirv.hpp>
#include <spirv_cross.hpp>
#include <sstream> #include <sstream>

2
src/dawn_native/d3d12/ShaderModuleD3D12.cpp
View File

@ -20,7 +20,7 @@
#include "dawn_native/d3d12/DeviceD3D12.h" #include "dawn_native/d3d12/DeviceD3D12.h"
#include "dawn_native/d3d12/PipelineLayoutD3D12.h" #include "dawn_native/d3d12/PipelineLayoutD3D12.h"
#include <spirv-cross/spirv_hlsl.hpp> #include <spirv_hlsl.hpp>
namespace dawn_native { namespace d3d12 { namespace dawn_native { namespace d3d12 {

2
src/dawn_native/metal/ShaderModuleMTL.mm
View File

@ -18,7 +18,7 @@
#include "dawn_native/metal/DeviceMTL.h" #include "dawn_native/metal/DeviceMTL.h"
#include "dawn_native/metal/PipelineLayoutMTL.h" #include "dawn_native/metal/PipelineLayoutMTL.h"
#include <spirv-cross/spirv_msl.hpp> #include <spirv_msl.hpp>
#include <sstream> #include <sstream>

2
src/dawn_native/null/DeviceNull.cpp
View File

@ -19,7 +19,7 @@
#include "dawn_native/DynamicUploader.h" #include "dawn_native/DynamicUploader.h"
#include "dawn_native/Instance.h" #include "dawn_native/Instance.h"
#include <spirv-cross/spirv_cross.hpp> #include <spirv_cross.hpp>
namespace dawn_native { namespace null { namespace dawn_native { namespace null {

2
src/dawn_native/opengl/ShaderModuleGL.cpp
View File

@ -18,7 +18,7 @@
#include "common/Platform.h" #include "common/Platform.h"
#include "dawn_native/opengl/DeviceGL.h" #include "dawn_native/opengl/DeviceGL.h"
#include <spirv-cross/spirv_glsl.hpp> #include <spirv_glsl.hpp>
#include <sstream> #include <sstream>

2
src/dawn_native/vulkan/ShaderModuleVk.cpp
View File

@ -17,7 +17,7 @@
#include "dawn_native/vulkan/DeviceVk.h" #include "dawn_native/vulkan/DeviceVk.h"
#include "dawn_native/vulkan/FencedDeleter.h" #include "dawn_native/vulkan/FencedDeleter.h"
#include <spirv-cross/spirv_cross.hpp> #include <spirv_cross.hpp>
namespace dawn_native { namespace vulkan { namespace dawn_native { namespace vulkan {

9
third_party/BUILD.gn vendored
View File

@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("../scripts/dawn_overrides_with_defaults.gni")
import("../scripts/dawn_features.gni")
import("//build_overrides/build.gni") import("//build_overrides/build.gni")
import("../scripts/dawn_features.gni")
import("../scripts/dawn_overrides_with_defaults.gni")
is_msvc = is_win && !is_clang is_msvc = is_win && !is_clang
@ -26,7 +26,10 @@ is_msvc = is_win && !is_clang
spirv_cross_dir = dawn_spirv_cross_dir spirv_cross_dir = dawn_spirv_cross_dir
config("spirv_cross_public") { config("spirv_cross_public") {
include_dirs = [ "${spirv_cross_dir}/.." ] include_dirs = [
"${spirv_cross_dir}",
"${spirv_cross_dir}/..",
]
defines = [ "SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS" ] defines = [ "SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS" ]
} }