From e38d8649dc8397e64c6552f24ae153f120b34daf Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 24 Dec 2021 01:51:45 -0700 Subject: [PATCH] gpu-dawn: update to latest Dawn version as of Dec 23, 2021 See hexops/dawn#5 Helps hexops/mach#121 Signed-off-by: Stephen Gutekanst --- gpu-dawn/build_dawn.zig | 2 ++ gpu-dawn/libs/dawn | 2 +- gpu-dawn/src/dawn/dawn_native_mach.cpp | 2 +- gpu-dawn/src/dawn/sources/dawn_native.cpp | 1 + gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp | 5 +++-- gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gpu-dawn/build_dawn.zig b/gpu-dawn/build_dawn.zig index d10fb410..153fed40 100644 --- a/gpu-dawn/build_dawn.zig +++ b/gpu-dawn/build_dawn.zig @@ -683,6 +683,7 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti include("libs/dawn/third_party/vulkan-deps/spirv-headers/src/include"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/out/Debug/gen/third_party/vulkan-deps/spirv-tools/src/include"), + include("libs/dawn/third_party/vulkan-deps/spirv-headers/src/include/spirv/unified1"), }) catch unreachable; // spvtools @@ -700,6 +701,7 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti sources.appendSlice(&.{ thisDir() ++ "/src/dawn/sources/spirv_tools_opt.cpp", thisDir() ++ "/src/dawn/sources/spirv_tools_opt_2.cpp", + thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/dataflow.cpp", thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/local_single_store_elim_pass.cpp", thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/loop_unswitch_pass.cpp", thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/mem_pass.cpp", diff --git a/gpu-dawn/libs/dawn b/gpu-dawn/libs/dawn index e3cca088..cf5e5a39 160000 --- a/gpu-dawn/libs/dawn +++ b/gpu-dawn/libs/dawn @@ -1 +1 @@ -Subproject commit e3cca0887f5d8a03864f2e419594b5314f4aeda4 +Subproject commit cf5e5a3913784ed49baa5029cb87c777add26ae2 diff --git a/gpu-dawn/src/dawn/dawn_native_mach.cpp b/gpu-dawn/src/dawn/dawn_native_mach.cpp index 4757df36..750795b8 100644 --- a/gpu-dawn/src/dawn/dawn_native_mach.cpp +++ b/gpu-dawn/src/dawn/dawn_native_mach.cpp @@ -90,7 +90,7 @@ MACH_EXPORT WGPUDevice machDawnNativeAdapter_createDevice(MachDawnNativeAdapter auto self = reinterpret_cast(adapter); if (deviceDescriptor == nullptr) { - return self->CreateDevice(nullptr); + return self->CreateDevice(); } std::vector cppRequiredExtensions; diff --git a/gpu-dawn/src/dawn/sources/dawn_native.cpp b/gpu-dawn/src/dawn/sources/dawn_native.cpp index 9db43af1..683b2f50 100644 --- a/gpu-dawn/src/dawn/sources/dawn_native.cpp +++ b/gpu-dawn/src/dawn/sources/dawn_native.cpp @@ -69,4 +69,5 @@ #include "src/dawn_native/TintUtils.cpp" #include "src/dawn_native/Toggles.cpp" #include "src/dawn_native/VertexFormat.cpp" +#include "src/dawn_native/webgpu_absl_format.cpp" #include "src/dawn_native/utils/WGPUHelpers.cpp" diff --git a/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp b/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp index 50f8c93d..f66d9fef 100644 --- a/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp +++ b/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp @@ -13,8 +13,8 @@ #include "third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/constants.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/control_dependence.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_sampled_image_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_half_pass.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_sampled_image_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/dataflow.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_branch_elim_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_insert_elim_pass.cpp" @@ -23,6 +23,7 @@ #include "third_party/vulkan-deps/spirv-tools/src/source/opt/decoration_manager.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/def_use_manager.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/desc_sroa.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opt/desc_sroa_util.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_analysis.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_tree.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_constant_pass.cpp" @@ -78,7 +79,7 @@ #include "third_party/vulkan-deps/spirv-tools/src/source/opt/simplification_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/strength_reduction_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_debug_info_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_reflect_info_pass.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_nonsemantic_info_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/struct_cfg_analysis.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp" diff --git a/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp b/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp index 76d9c4b3..702dc906 100644 --- a/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp +++ b/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp @@ -5,5 +5,6 @@ #include "third_party/vulkan-deps/spirv-tools/src/source/opt/local_access_chain_convert_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/remove_unused_interface_variables_pass.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opt/replace_desc_array_access_using_var_index.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_replacement_pass.cpp" #include "third_party/vulkan-deps/spirv-tools/src/source/opt/set_spec_constant_default_value_pass.cpp"