Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

externals: Update all submodules to latest release/commit #615

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions externals/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ if(NOT USE_SYSTEM_SOUNDTOUCH)
endif()

# Teakra
set(BUILD_TESTING OFF CACHE BOOL "")
add_subdirectory(teakra EXCLUDE_FROM_ALL)

# SDL2
Expand Down
2 changes: 1 addition & 1 deletion externals/catch2
Submodule catch2 updated 61 files
+3 −0 .bazelrc
+2 −1 .clang-tidy
+1 −1 .conan/test_package/CMakeLists.txt
+1 −1 .github/workflows/mac-builds-m1.yml
+6 −2 .github/workflows/mac-builds.yml
+2 −0 BUILD.bazel
+1 −0 CMake/CatchConfigOptions.cmake
+9 −12 CMakeLists.txt
+1 −0 MODULE.bazel
+0 −16 WORKSPACE.bazel
+14 −4 docs/cmake-integration.md
+9 −0 docs/configuration.md
+26 −0 docs/release-notes.md
+1 −1 docs/tostring.md
+1 −1 examples/CMakeLists.txt
+16 −19 extras/Catch.cmake
+61 −25 extras/CatchAddTests.cmake
+19 −13 extras/catch_amalgamated.cpp
+84 −63 extras/catch_amalgamated.hpp
+1 −1 meson.build
+1 −0 meson_options.txt
+4 −4 src/catch2/benchmark/detail/catch_stats.cpp
+1 −1 src/catch2/catch_timer.cpp
+4 −1 src/catch2/catch_tostring.cpp
+5 −1 src/catch2/catch_tostring.hpp
+9 −0 src/catch2/catch_user_config.hpp.in
+1 −1 src/catch2/catch_version.cpp
+2 −2 src/catch2/catch_version_macros.hpp
+1 −1 src/catch2/generators/catch_generators_range.hpp
+39 −31 src/catch2/internal/catch_compiler_capabilities.hpp
+1 −1 src/catch2/internal/catch_console_colour.cpp
+1 −1 src/catch2/internal/catch_random_number_generator.cpp
+35 −26 src/catch2/matchers/catch_matchers_range_equals.hpp
+22 −15 src/catch2/meson.build
+5 −2 src/catch2/reporters/catch_reporter_console.cpp
+1 −2 tests/ExtraTests/CMakeLists.txt
+2 −2 tests/SelfTest/Baselines/automake.sw.approved.txt
+2 −2 tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+5 −1 tests/SelfTest/Baselines/compact.sw.approved.txt
+5 −1 tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+1 −1 tests/SelfTest/Baselines/console.std.approved.txt
+37 −3 tests/SelfTest/Baselines/console.sw.approved.txt
+37 −3 tests/SelfTest/Baselines/console.sw.multi.approved.txt
+5 −3 tests/SelfTest/Baselines/junit.sw.approved.txt
+5 −3 tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+4 −2 tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+4 −2 tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+16 −8 tests/SelfTest/Baselines/tap.sw.approved.txt
+16 −8 tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+4 −4 tests/SelfTest/Baselines/teamcity.sw.approved.txt
+4 −4 tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
+41 −3 tests/SelfTest/Baselines/xml.sw.approved.txt
+41 −3 tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+23 −0 tests/SelfTest/IntrospectiveTests/ToString.tests.cpp
+56 −0 tests/SelfTest/UsageTests/Compilation.tests.cpp
+2 −2 tests/SelfTest/UsageTests/EnumToString.tests.cpp
+19 −0 tests/SelfTest/UsageTests/MatchersRanges.tests.cpp
+9 −2 tests/TestScripts/DiscoverTests/CMakeLists.txt
+36 −14 tests/TestScripts/DiscoverTests/VerifyRegistration.py
+7 −0 tests/TestScripts/DiscoverTests/register-tests.cpp
+1 −1 tools/misc/CMakeLists.txt
2 changes: 1 addition & 1 deletion externals/cryptopp-cmake
2 changes: 1 addition & 1 deletion externals/cubeb
2 changes: 1 addition & 1 deletion externals/fmt
Submodule fmt updated 56 files
+6 −0 .clang-format
+5 −3 .github/workflows/cifuzz.yml
+1 −1 .github/workflows/doc.yml
+8 −36 .github/workflows/lint.yml
+15 −13 .github/workflows/linux.yml
+6 −2 .github/workflows/macos.yml
+4 −4 .github/workflows/scorecard.yml
+4 −9 .github/workflows/windows.yml
+1 −0 .gitignore
+31 −15 CMakeLists.txt
+322 −0 ChangeLog.md
+1 −0 README.md
+54 −23 doc/api.md
+1 −1 doc/get-started.md
+2 −2 doc/index.md
+4 −5 doc/syntax.md
+20 −28 include/fmt/args.h
+1,775 −1,890 include/fmt/base.h
+376 −470 include/fmt/chrono.h
+20 −22 include/fmt/color.h
+54 −44 include/fmt/compile.h
+65 −44 include/fmt/format-inl.h
+1,104 −1,287 include/fmt/format.h
+43 −55 include/fmt/os.h
+43 −88 include/fmt/ostream.h
+107 −130 include/fmt/printf.h
+98 −130 include/fmt/ranges.h
+74 −47 include/fmt/std.h
+97 −46 include/fmt/xchar.h
+19 −1 src/fmt.cc
+4 −1 src/format.cc
+6 −11 src/os.cc
+35 −3 support/mkdocs
+311 −290 support/python/mkdocstrings_handlers/cxx/__init__.py
+31 −61 support/release.py
+4 −19 test/CMakeLists.txt
+14 −0 test/args-test.cc
+131 −144 test/base-test.cc
+40 −15 test/chrono-test.cc
+1 −27 test/compile-error-test/CMakeLists.txt
+51 −13 test/compile-test.cc
+4 −3 test/format-impl-test.cc
+148 −27 test/format-test.cc
+19 −11 test/gtest/gmock-gtest-all.cc
+24 −10 test/gtest/gmock/gmock.h
+4 −3 test/gtest/gtest/gtest.h
+24 −0 test/no-builtin-types-test.cc
+1 −1 test/os-test.cc
+23 −16 test/ranges-test.cc
+3 −3 test/scan-test.cc
+5 −5 test/scan.h
+29 −3 test/std-test.cc
+1 −1 test/test-assert.h
+1 −1 test/unicode-test.cc
+4 −5 test/util.cc
+23 −105 test/xchar-test.cc
2 changes: 1 addition & 1 deletion externals/glslang
Submodule glslang updated 104 files
2 changes: 1 addition & 1 deletion externals/libyuv
Submodule libyuv updated 79 files
+0 −52 .vpython
+7 −3 .vpython3
+3 −3 BUILD.gn
+34 −1 CMakeLists.txt
+533 −1,193 DEPS
+47 −34 PRESUBMIT.py
+2 −1 README.chromium
+3 −2 build_overrides/build.gni
+1 −0 docs/environment_variables.md
+1 −1 download_vs_toolchain.py
+8 −4 include/libyuv/compare_row.h
+43 −0 include/libyuv/convert.h
+13 −0 include/libyuv/convert_from_argb.h
+37 −36 include/libyuv/cpu_id.h
+9 −5 include/libyuv/cpu_support.h
+14 −2 include/libyuv/planar_functions.h
+6 −2 include/libyuv/rotate_row.h
+433 −50 include/libyuv/row.h
+1,789 −0 include/libyuv/row_sve.h
+15 −0 include/libyuv/scale.h
+60 −9 include/libyuv/scale_row.h
+1 −1 include/libyuv/version.h
+6 −2 infra/config/PRESUBMIT.py
+1 −0 infra/config/commit-queue.cfg
+7 −0 infra/config/cr-buildbucket.cfg
+11 −7 infra/config/main.star
+1 −1 infra/config/project.cfg
+34 −2 pylintrc
+16 −14 source/compare_gcc.cc
+4 −4 source/compare_neon.cc
+28 −28 source/compare_neon64.cc
+2 −2 source/compare_win.cc
+631 −79 source/convert.cc
+478 −0 source/convert_argb.cc
+21 −41 source/convert_from.cc
+202 −0 source/convert_from_argb.cc
+4 −4 source/convert_to_argb.cc
+5 −3 source/convert_to_i420.cc
+21 −9 source/cpu_id.cc
+127 −6 source/planar_functions.cc
+10 −0 source/rotate.cc
+11 −0 source/rotate_argb.cc
+14 −12 source/rotate_gcc.cc
+113 −113 source/rotate_neon.cc
+147 −147 source/rotate_neon64.cc
+2 −2 source/rotate_win.cc
+54 −18 source/row_any.cc
+113 −158 source/row_common.cc
+1,518 −1,651 source/row_gcc.cc
+18 −16 source/row_lasx.cc
+18 −16 source/row_lsx.cc
+536 −494 source/row_neon.cc
+876 −835 source/row_neon64.cc
+3 −3 source/row_rvv.cc
+943 −76 source/row_sme.cc
+170 −1,002 source/row_sve.cc
+47 −40 source/row_win.cc
+62 −2 source/scale.cc
+51 −8 source/scale_argb.cc
+15 −0 source/scale_common.cc
+156 −156 source/scale_gcc.cc
+66 −66 source/scale_neon.cc
+288 −226 source/scale_neon64.cc
+4 −4 source/scale_rgb.cc
+59 −10 source/scale_rvv.cc
+264 −0 source/scale_sme.cc
+18 −8 source/scale_uv.cc
+2 −2 source/scale_win.cc
+644 −535 tools_libyuv/autoroller/roll_deps.py
+115 −99 tools_libyuv/autoroller/unittests/roll_deps_test.py
+15 −16 tools_libyuv/get_landmines.py
+1 −1 unit_test/convert_argb_test.cc
+28 −2 unit_test/convert_test.cc
+56 −82 unit_test/cpu_test.cc
+403 −294 unit_test/planar_test.cc
+6 −6 unit_test/scale_argb_test.cc
+1 −1 unit_test/scale_test.cc
+3 −0 unit_test/unit_test.cc
+4 −0 util/cpuid.c
2 changes: 1 addition & 1 deletion externals/lodepng/lodepng
Submodule lodepng updated 6 files
+290 −68 lodepng.cpp
+123 −46 lodepng.h
+169 −10 lodepng_unittest.cpp
+5 −336 lodepng_util.cpp
+3 −37 lodepng_util.h
+282 −184 pngdetail.cpp
2 changes: 1 addition & 1 deletion externals/openal-soft
Submodule openal-soft updated 363 files
2 changes: 1 addition & 1 deletion externals/sdl2/SDL
Submodule SDL updated 1180 files
2 changes: 1 addition & 1 deletion externals/vma
Submodule vma updated 135 files
2 changes: 1 addition & 1 deletion externals/zstd
Submodule zstd updated 166 files
31 changes: 15 additions & 16 deletions src/video_core/renderer_vulkan/vk_platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ namespace Vulkan {

namespace {
static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT severity, VkDebugUtilsMessageTypeFlagsEXT type,
const VkDebugUtilsMessengerCallbackDataEXT* callback_data, void* user_data) {
vk::DebugUtilsMessageSeverityFlagBitsEXT severity, vk::DebugUtilsMessageTypeFlagsEXT type,
const vk::DebugUtilsMessengerCallbackDataEXT* callback_data, void* user_data) {

switch (static_cast<u32>(callback_data->messageIdNumber)) {
case 0x609a13b: // Vertex attribute at location not consumed by shader
Expand All @@ -42,14 +42,14 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsCallback(

Common::Log::Level level{};
switch (severity) {
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eError:
level = Common::Log::Level::Error;
break;
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eWarning:
level = Common::Log::Level::Info;
break;
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eInfo:
case vk::DebugUtilsMessageSeverityFlagBitsEXT::eVerbose:
level = Common::Log::Level::Debug;
break;
default:
Expand All @@ -63,35 +63,34 @@ static VKAPI_ATTR VkBool32 VKAPI_CALL DebugUtilsCallback(
return VK_FALSE;
}

static VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags,
VkDebugReportObjectTypeEXT objectType,
static VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(vk::DebugReportFlagsEXT flags,
vk::DebugReportObjectTypeEXT objectType,
uint64_t object, std::size_t location,
int32_t messageCode,
const char* pLayerPrefix,
const char* pMessage, void* pUserData) {

const VkDebugReportFlagBitsEXT severity = static_cast<VkDebugReportFlagBitsEXT>(flags);
const auto severity = static_cast<vk::DebugReportFlagBitsEXT>(flags.operator VkFlags());
Common::Log::Level level{};
switch (severity) {
case VK_DEBUG_REPORT_ERROR_BIT_EXT:
case vk::DebugReportFlagBitsEXT::eError:
level = Common::Log::Level::Error;
break;
case VK_DEBUG_REPORT_INFORMATION_BIT_EXT:
case vk::DebugReportFlagBitsEXT::eInformation:
level = Common::Log::Level::Warning;
break;
case VK_DEBUG_REPORT_DEBUG_BIT_EXT:
case VK_DEBUG_REPORT_WARNING_BIT_EXT:
case VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT:
case vk::DebugReportFlagBitsEXT::eDebug:
case vk::DebugReportFlagBitsEXT::eWarning:
case vk::DebugReportFlagBitsEXT::ePerformanceWarning:
level = Common::Log::Level::Debug;
break;
default:
level = Common::Log::Level::Info;
}

const vk::DebugReportObjectTypeEXT type = static_cast<vk::DebugReportObjectTypeEXT>(objectType);
LOG_GENERIC(Common::Log::Class::Render_Vulkan, level,
"type = {}, object = {} | MessageCode = {:#x}, LayerPrefix = {} | {}",
vk::to_string(type), object, messageCode, pLayerPrefix, pMessage);
vk::to_string(objectType), object, messageCode, pLayerPrefix, pMessage);

return VK_FALSE;
}
Expand Down
8 changes: 4 additions & 4 deletions src/video_core/shader/shader_jit_x64_compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,20 +409,20 @@ void JitShader::Compile_EvaluateCondition(Instruction instr) {
break;

case Instruction::FlowControlType::And:
mov(al, COND0);
mov(bl, COND1);
mov(al, COND0.cvt8());
mov(bl, COND1.cvt8());
xor_(al, (instr.flow_control.refx.Value() ^ 1));
xor_(bl, (instr.flow_control.refy.Value() ^ 1));
and_(al, bl);
break;

case Instruction::FlowControlType::JustX:
mov(al, COND0);
mov(al, COND0.cvt8());
xor_(al, (instr.flow_control.refx.Value() ^ 1));
break;

case Instruction::FlowControlType::JustY:
mov(al, COND1);
mov(al, COND1.cvt8());
xor_(al, (instr.flow_control.refy.Value() ^ 1));
break;
}
Expand Down
Loading