aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Clayton <bclayton@google.com>2020-10-02 13:56:42 +0100
committerBen Clayton <bclayton@google.com>2020-10-05 16:41:26 +0100
commit46072ad8301b677f46b32f98860143af5e9cc8da (patch)
tree01e41982d2a16435d8f52e429222e9b08fd2eff2
parent0eee2d45d053dfc566baa58442a9b1b708e4f2a7 (diff)
downloadamber-46072ad8301b677f46b32f98860143af5e9cc8da.tar.gz
Roll dxc, spirv-tools & swiftshader to latest
Use SwiftShader's new `SWIFTSHADER_LOGGING_LEVEL` option to raise the default logging level from 'Info' to 'Error'. This is done to work around #914
-rw-r--r--DEPS6
-rw-r--r--third_party/CMakeLists.txt1
2 files changed, 4 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index a73655e..22f11e0 100644
--- a/DEPS
+++ b/DEPS
@@ -13,15 +13,15 @@ vars = {
'clspv_revision': '86ce19c0130bd13a70862a50a9aa9676eba6548c',
'cppdap_revision': '1fd23dda91e01550be1a421de307e6fedb2035a9',
'cpplint_revision': '26470f9ccb354ff2f6d098f831271a1833701b28',
- 'dxc_revision': '711e5e2969b3809d7f2254ca17a67d862b359097',
+ 'dxc_revision': 'b0c029eebda9f8e212d1e447c5b1f8a969bb9db6',
'glslang_revision': '3ee5f2f1d3316e228916788b300d786bb574d337',
'googletest_revision': 'a781fe29bcf73003559a3583167fe3d647518464',
'json_revision': 'fbec662afab55019654e471b65a846a47a696722',
'lodepng_revision': '34628e89e80cd007179b25b0b2695e6af0f57fac',
'shaderc_revision': 'ba92b11e1fcaf4c38a64f84d643d6429175bf650',
'spirv_headers_revision': '3fdabd0da2932c276b25b9b4a988ba134eba1aa6',
- 'spirv_tools_revision': 'fd3cabd8b5fc43ce83884ac06486c283b9902b4f',
- 'swiftshader_revision': '6a8a74986c357b0c6fa0dfd2b4b9230af8d39d1a',
+ 'spirv_tools_revision': 'd91afd8de27a064f938a196fdea2ace234971faa',
+ 'swiftshader_revision': 'cbb5a10e03fb655a3617988ff5d71bf37892761c',
'vulkan_headers_revision': '83825d55c7d522931124696ecb07ed48f2693e5c',
'vulkan_loader_revision': 'bfe4f378aee6a2825b8112429cd46529d936babf',
'vulkan_validationlayers_revision': 'c3215f8f89bde067386ff8358e0b30774691c8a5',
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 6d13d01..4319556 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -80,6 +80,7 @@ if (${AMBER_ENABLE_SWIFTSHADER})
set(SWIFTSHADER_BUILD_SAMPLES FALSE)
set(SWIFTSHADER_BUILD_TESTS FALSE)
set(SWIFTSHADER_WARNINGS_AS_ERRORS FALSE)
+ set(SWIFTSHADER_LOGGING_LEVEL "Error")
if (${AMBER_ENABLE_VK_DEBUGGING})
set(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER TRUE)