Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-master

.gitmodules

@@ -63,3 +63,12 @@
 [submodule "Externals/fmt/fmt"]
 	path = Externals/fmt/fmt
 	url = https://github.com/fmtlib/fmt.git
+[submodule "Externals/lz4/lz4"]
+	path = Externals/lz4/lz4
+	url = https://github.com/lz4/lz4
+[submodule "Externals/xxhash/xxHash"]
+	path = Externals/xxhash/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+[submodule "Externals/enet/enet"]
+	path = Externals/enet/enet
+	url = https://github.com/lsalzman/enet.git

CMakeLists.txt

@@ -219,9 +219,7 @@ if(ENABLE_GENERIC)
   set(_M_GENERIC 1)
   add_definitions(-D_M_GENERIC=1)
 elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
-  set(_M_X86 1)
   set(_M_X86_64 1)
-  add_definitions(-D_M_X86=1)
   add_definitions(-D_M_X86_64=1)
   check_and_add_flag(HAVE_SSE2 -msse2)
 elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
@@ -625,7 +623,7 @@ endif()
 #   - place the CMakeLists.txt in the first-level subdirectory, e.g.
 #     Externals/zlib/CMakeLists.txt (that is: NOT in some Src/ subdirectory)
 #
-if (_M_X86)
+if (_M_X86_64)
   add_subdirectory(Externals/Bochs_disasm)
 endif()
 add_subdirectory(Externals/cpp-optparse)
@@ -661,12 +659,9 @@ endif()
 
 dolphin_find_optional_system_library(pugixml Externals/pugixml)
 
-dolphin_find_optional_system_library_pkgconfig(ENET libenet>=1.3.8 enet::enet Externals/enet)
+dolphin_find_optional_system_library_pkgconfig(ENET libenet>=1.3.18 enet::enet Externals/enet)
 
-if(NOT XXHASH_FOUND)
-  message(STATUS "Using static xxhash from Externals")
-  add_subdirectory(Externals/xxhash)
-endif()
+dolphin_find_optional_system_library_pkgconfig(xxhash libxxhash>=0.8.2 xxhash::xxhash Externals/xxhash)
 
 dolphin_find_optional_system_library(BZip2 Externals/bzip2)
 
@@ -682,6 +677,8 @@ dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::m
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
 
+dolphin_find_optional_system_library_pkgconfig(lz4 liblz4>=1.8 LZ4::LZ4 Externals/lz4)
+
 dolphin_find_optional_system_library_pkgconfig(SPNG spng spng::spng Externals/libspng)
 
 # Using static FreeSurround from Externals

Contributing.md

@@ -1,17 +1,32 @@
-# <a name="main-heading"></a>Dolphin Coding Style & Licensing
+# <a name="main-section-overview"></a>Dolphin Coding Style & Legal Requirements
 
-If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
-
-# <a name="main-section-overview"></a>Main sections
-
-- [Introduction](#introduction)
+- [Legal](#legal)
+- [Coding style introduction](#introduction)
 - [C++ coding style and formatting](#cpp-coding-style-and-formatting)
 - [C++ code-specific guidelines](#cpp-code-specific-guidelines)
 - [Android](#android)
 - [Help](#help)
 
+# <a name="legal"></a>Legal
 
-# <a name="introduction"></a>Introduction
+Summary:
+
+- [Trade secrets](#trade-secrets)
+- [Code licensing](#code-licensing)
+
+## <a name="trade-secrets"></a>Trade secrets
+
+Following all relevant laws is of utmost importance for an emulation project like Dolphin.
+
+If you know any confidential information related to the GameCube, Wii, or Triforce, either because you signed a non-disclosure agreement or because you looked at leaked materials, we ask that you don't contribute code to Dolphin **at all**. While accepting code from contributors who know confidential information is legal if the code is unrelated to the confidential information, we refuse to accept code from such contributors because it greatly increases our review burden and increases the legal risk we take.
+
+Also, this probably goes without saying, but piracy is strictly forbidden both on GitHub and in all other Dolphin channels.
+
+## <a name="code-licensing"></a>Code licensing
+
+If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
+
+# <a name="introduction"></a>Coding style introduction
 
 Summary:
 

Data/Sys/GameSettings/G2BE5G.ini

@@ -0,0 +1,16 @@
+# G2BE5G - Black & Bruised
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Disable interlaced rendering
+0x800D8520:dword:0x38600000
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/G2BP7D.ini

@@ -0,0 +1,16 @@
+# G2BP7D - Black & Bruised
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Disable interlaced rendering
+0x800D9E68:dword:0x38600000
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GC8JA4.ini

@@ -0,0 +1,24 @@
+# GC8JA4 - ｸﾗｯｼｭ･ﾊﾞﾝﾃﾞｨｸｰ 爆走！ニトロカート
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+$Fix C4 texture tiling (used for buttons and some character icons)
+0400328C 7D0340AE
+04003290 5108452E
+04003294 5508E13E
+04003298 4E800020
+040CA1B4 4BF390D9
+
+[Video_Settings]
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GCN.ini

@@ -11,6 +11,12 @@
 
 [ActionReplay]
 # Add action replay cheats here.
+$Fix C4 texture tiling (used for buttons and some character icons)
+0400328C 7D0340AE
+04003290 5108452E
+04003294 5508E13E
+04003298 4E800020
+040CC574 4BF36D19
 
 [Video_Settings]
 

Data/Sys/GameSettings/RJ3.ini

@@ -0,0 +1,17 @@
+# RJ3E20, RJ3P7J - Jeep Thrills
+
+[Core]
+# Values set here will override the main Dolphin settings.
+# Fixes the blue screen problem. See issue 13118 for more info.
+AccurateNaNs = True
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]

Data/Sys/GameSettings/RTH.ini

@@ -8,6 +8,8 @@
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
+$Disable blur
+0x8015b900:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.

Data/Sys/GameSettings/SFI.ini

@@ -12,9 +12,9 @@
 [ActionReplay]
 # Add action replay cheats here.
 
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
-
 [Video_Hacks]
+# Needed for cutscenes and the book to work properly (https://bugs.dolphin-emu.org/issues/4723)
 ImmediateXFBEnable = False
+# Needed for the book to work properly (https://bugs.dolphin-emu.org/issues/13356)
+EFBToTextureEnable = False
 

Data/Sys/GameSettings/SGLPA4.ini

@@ -0,0 +1,8 @@
+# SGLPA4 - Gormiti: The Lords of Nature!
+
+[OnFrame]
+# Fixes black screen ingame, see https://bugs.dolphin-emu.org/issues/12436
+# This NOPs out UpdateFade's call to RenderFade. We are probably emulating the way the fade works
+# incorrectly, but for now this patch makes the game playable.
+$Fix black screen
+0x801D59C8:dword:0x60000000

Data/Sys/Shaders/AutoHDR.glsl

@@ -30,6 +30,11 @@ DefaultValue = 2.5
 [/configuration]
 */
 
+float luminance(float3 color)
+{
+	return dot(color, float3(0.2126f, 0.7152f, 0.0722f));
+}
+
 void main()
 {
 	float4 color = Sample();
@@ -46,8 +51,8 @@ void main()
 	// Restore the original SDR (0-1) brightness (we might or might not restore it later)
 	color.rgb /= hdr_paper_white;
 
-	// Find the color average
-	float sdr_ratio = (color.r + color.g + color.b) / 3.0;
+	// Find the color luminance (it works better than average)
+	float sdr_ratio = luminance(color.rgb);
 
 	const float auto_hdr_max_white = max(HDR_DISPLAY_MAX_NITS / (hdr_paper_white_nits / hdr_sdr_white_nits), hdr_sdr_white_nits) / hdr_sdr_white_nits;
 	if (sdr_ratio > AUTO_HDR_SHOULDER_START_ALPHA && AUTO_HDR_SHOULDER_START_ALPHA < 1.0)

Data/Sys/Shaders/default_pre_post_process.glsl

@@ -199,15 +199,16 @@ float4 AreaSampling(float3 uvw, float gamma)
 {
 	// Determine the sizes of the source and target images.
 	float2 source_size = GetResolution();
+	float2 target_size = GetWindowResolution();
 	float2 inverted_target_size = GetInvWindowResolution();
 
-	// Determine the range of the source image that the target pixel will cover.
-	// Workaround: shift the resolution by 1/4 pixel to align the results with other sampling algorithms,
-	// otherwise the results would be offsetted, and we'd be sampling from coordinates outside the valid range.
-	float2 adjusted_source_size = source_size - 0.25;
-	float2 range = adjusted_source_size * inverted_target_size;
-	float2 beg = (uvw.xy * adjusted_source_size) - (range * 0.5);
-	float2 end = beg + range;
+	// Compute the top-left and bottom-right corners of the target pixel box.
+	float2 t_beg = floor(uvw.xy * target_size);
+	float2 t_end = t_beg + float2(1.0, 1.0);
+
+	// Convert the target pixel box to source pixel box.
+	float2 beg = t_beg * inverted_target_size * source_size;
+	float2 end = t_end * inverted_target_size * source_size;
 
 	// Compute the top-left and bottom-right corners of the pixel box.
 	float2 f_beg = floor(beg);
@@ -238,8 +239,8 @@ float4 AreaSampling(float3 uvw, float gamma)
 	avg_color += area_se * QuickSampleByPixel(float2(f_end.x, f_end.y) + offset, uvw.z, gamma);
 
 	// Determine the size of the pixel box.
-	int x_range = int(f_end.x - f_beg.x + 0.5);
-	int y_range = int(f_end.y - f_beg.y + 0.5);
+	int x_range = int(f_end.x - f_beg.x - 0.5);
+	int y_range = int(f_end.y - f_beg.y - 0.5);
 
 	// Workaround to compile the shader with DX11/12.
 	// If this isn't done, it will complain that the loop could have too many iterations.

Externals/cubeb/CMakeLists.txt

@@ -18,8 +18,9 @@ endif()
 
 if (NOT MSVC)
   set(CMAKE_C_STANDARD 99)
-  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_STANDARD 17)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 endif()
 
 if(USE_SANITIZERS)
@@ -56,8 +57,8 @@ if(NOT MSVC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -fno-exceptions -fno-rtti")
 else()
-  #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
-  #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable Exceptions
+  #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable RTTI
+  #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable Exceptions
 endif()
 
 add_library(cubeb
@@ -157,6 +158,10 @@ if(LAZY_LOAD_LIBS)
 
   if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
     target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
+
+    if(ANDROID)
+      target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+    endif()
   endif()
 
 else()
@@ -262,7 +267,7 @@ endif()
 check_include_files(SLES/OpenSLES.h USE_OPENSL)
 if(USE_OPENSL)
   target_sources(cubeb PRIVATE
-    cubeb/src/cubeb_opensl.c
+    cubeb/src/cubeb_opensl.cpp
     cubeb/src/cubeb-jni.cpp)
   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
   target_link_libraries(cubeb PRIVATE OpenSLES)

Externals/cubeb/cubeb

@@ -1 +1 @@
-Subproject commit 27d2a102b0b75d9e49d43bc1ea516233fb87d778
+Subproject commit 54217bca3f3e0cd53c073690a23dd25d83557909

Externals/cubeb/msvc/cubeb.vcxproj

@@ -42,6 +42,7 @@
     <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
     <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
     <ClInclude Include="..\cubeb\src\cubeb_tracing.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_triple_buffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />

Externals/cubeb/msvc/cubeb.vcxproj.filters

@@ -11,6 +11,7 @@
     <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
     <ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_triple_buffer.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" />
     <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />

Externals/curl/curl

@@ -1 +1 @@
-Subproject commit 7ab9d43720bc34d9aa351c7ca683c1668ebf8335
+Subproject commit d755a5f7c009dd63a61b2c745180d8ba937cbfeb

Externals/curl/curl.vcxproj

@@ -48,7 +48,6 @@
     <ClCompile Include="curl\lib\curl_gethostname.c" />
     <ClCompile Include="curl\lib\curl_get_line.c" />
     <ClCompile Include="curl\lib\curl_gssapi.c" />
-    <ClCompile Include="curl\lib\curl_log.c" />
     <ClCompile Include="curl\lib\curl_memrchr.c" />
     <ClCompile Include="curl\lib\curl_multibyte.c" />
     <ClCompile Include="curl\lib\curl_ntlm_core.c" />
@@ -59,6 +58,7 @@
     <ClCompile Include="curl\lib\curl_sasl.c" />
     <ClCompile Include="curl\lib\curl_sspi.c" />
     <ClCompile Include="curl\lib\curl_threads.c" />
+    <ClCompile Include="curl\lib\curl_trc.c" />
     <ClCompile Include="curl\lib\dict.c" />
     <ClCompile Include="curl\lib\doh.c" />
     <ClCompile Include="curl\lib\dynbuf.c" />
@@ -102,6 +102,7 @@
     <ClCompile Include="curl\lib\krb5.c" />
     <ClCompile Include="curl\lib\ldap.c" />
     <ClCompile Include="curl\lib\llist.c" />
+    <ClCompile Include="curl\lib\macos.c" />
     <ClCompile Include="curl\lib\md4.c" />
     <ClCompile Include="curl\lib\md5.c" />
     <ClCompile Include="curl\lib\memdebug.c" />
@@ -148,20 +149,15 @@
     <ClCompile Include="curl\lib\transfer.c" />
     <ClCompile Include="curl\lib\url.c" />
     <ClCompile Include="curl\lib\urlapi.c" />
-    <ClCompile Include="curl\lib\vauth\gsasl.c" />
     <ClCompile Include="curl\lib\version.c" />
     <ClCompile Include="curl\lib\version_win32.c" />
-    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
-    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
-    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
-    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
-    <ClCompile Include="curl\lib\vtls\rustls.c" />
-    <ClCompile Include="curl\lib\vtls\x509asn1.c" />
     <ClCompile Include="curl\lib\warnless.c" />
+    <ClCompile Include="curl\lib\ws.c" />
     <ClCompile Include="curl\lib\vauth\cleartext.c" />
     <ClCompile Include="curl\lib\vauth\cram.c" />
     <ClCompile Include="curl\lib\vauth\digest.c" />
     <ClCompile Include="curl\lib\vauth\digest_sspi.c" />
+    <ClCompile Include="curl\lib\vauth\gsasl.c" />
     <ClCompile Include="curl\lib\vauth\krb5_gssapi.c" />
     <ClCompile Include="curl\lib\vauth\krb5_sspi.c" />
     <ClCompile Include="curl\lib\vauth\ntlm.c" />
@@ -170,35 +166,41 @@
     <ClCompile Include="curl\lib\vauth\spnego_gssapi.c" />
     <ClCompile Include="curl\lib\vauth\spnego_sspi.c" />
     <ClCompile Include="curl\lib\vauth\vauth.c" />
+    <ClCompile Include="curl\lib\vquic\curl_msh3.c" />
+    <ClCompile Include="curl\lib\vquic\curl_ngtcp2.c" />
+    <ClCompile Include="curl\lib\vquic\curl_quiche.c" />
     <ClCompile Include="curl\lib\vquic\vquic.c" />
     <ClCompile Include="curl\lib\vssh\libssh.c" />
     <ClCompile Include="curl\lib\vssh\libssh2.c" />
     <ClCompile Include="curl\lib\vssh\wolfssh.c" />
     <ClCompile Include="curl\lib\vtls\bearssl.c" />
-    <ClCompile Include="curl\lib\vtls\gskit.c" />
     <ClCompile Include="curl\lib\vtls\gtls.c" />
+    <ClCompile Include="curl\lib\vtls\hostcheck.c" />
     <ClCompile Include="curl\lib\vtls\keylog.c" />
     <ClCompile Include="curl\lib\vtls\mbedtls.c" />
     <ClCompile Include="curl\lib\vtls\mbedtls_threadlock.c" />
-    <ClCompile Include="curl\lib\vtls\nss.c" />
     <ClCompile Include="curl\lib\vtls\openssl.c" />
+    <ClCompile Include="curl\lib\vtls\rustls.c" />
     <ClCompile Include="curl\lib\vtls\schannel.c" />
     <ClCompile Include="curl\lib\vtls\schannel_verify.c" />
     <ClCompile Include="curl\lib\vtls\sectransp.c" />
     <ClCompile Include="curl\lib\vtls\vtls.c" />
     <ClCompile Include="curl\lib\vtls\wolfssl.c" />
-    <ClCompile Include="curl\lib\ws.c" />
+    <ClCompile Include="curl\lib\vtls\x509asn1.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="curl\include\curl\curl.h" />
     <ClInclude Include="curl\include\curl\curlver.h" />
     <ClInclude Include="curl\include\curl\easy.h" />
+    <ClInclude Include="curl\include\curl\header.h" />
     <ClInclude Include="curl\include\curl\mprintf.h" />
     <ClInclude Include="curl\include\curl\multi.h" />
+    <ClInclude Include="curl\include\curl\options.h" />
     <ClInclude Include="curl\include\curl\stdcheaders.h" />
     <ClInclude Include="curl\include\curl\system.h" />
     <ClInclude Include="curl\include\curl\typecheck-gcc.h" />
     <ClInclude Include="curl\include\curl\urlapi.h" />
+    <ClInclude Include="curl\include\curl\websockets.h" />
     <ClInclude Include="curl\lib\altsvc.h" />
     <ClInclude Include="curl\lib\amigaos.h" />
     <ClInclude Include="curl\lib\arpa_telnet.h" />
@@ -237,7 +239,6 @@
     <ClInclude Include="curl\lib\curl_hmac.h" />
     <ClInclude Include="curl\lib\curl_krb5.h" />
     <ClInclude Include="curl\lib\curl_ldap.h" />
-    <ClInclude Include="curl\lib\curl_log.h" />
     <ClInclude Include="curl\lib\curl_md4.h" />
     <ClInclude Include="curl\lib\curl_md5.h" />
     <ClInclude Include="curl\lib\curl_memory.h" />
@@ -255,9 +256,9 @@
     <ClInclude Include="curl\lib\curl_sha256.h" />
     <ClInclude Include="curl\lib\curl_sspi.h" />
     <ClInclude Include="curl\lib\curl_threads.h" />
+    <ClInclude Include="curl\lib\curl_trc.h" />
     <ClInclude Include="curl\lib\dict.h" />
     <ClInclude Include="curl\lib\doh.h" />
-    <ClInclude Include="curl\lib\dotdot.h" />
     <ClInclude Include="curl\lib\dynbuf.h" />
     <ClInclude Include="curl\lib\dynhds.h" />
     <ClInclude Include="curl\lib\easyif.h" />
@@ -292,6 +293,7 @@
     <ClInclude Include="curl\lib\inet_ntop.h" />
     <ClInclude Include="curl\lib\inet_pton.h" />
     <ClInclude Include="curl\lib\llist.h" />
+    <ClInclude Include="curl\lib\macos.h" />
     <ClInclude Include="curl\lib\memdebug.h" />
     <ClInclude Include="curl\lib\mime.h" />
     <ClInclude Include="curl\lib\mqtt.h" />
@@ -339,33 +341,32 @@
     <ClInclude Include="curl\lib\urlapi-int.h" />
     <ClInclude Include="curl\lib\urldata.h" />
     <ClInclude Include="curl\lib\version_win32.h" />
-    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
-    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
-    <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
-    <ClInclude Include="curl\lib\vquic\vquic_int.h" />
-    <ClInclude Include="curl\lib\vtls\hostcheck.h" />
-    <ClInclude Include="curl\lib\vtls\rustls.h" />
-    <ClInclude Include="curl\lib\vtls\x509asn1.h" />
     <ClInclude Include="curl\lib\warnless.h" />
+    <ClInclude Include="curl\lib\ws.h" />
     <ClInclude Include="curl\lib\vauth\digest.h" />
     <ClInclude Include="curl\lib\vauth\ntlm.h" />
     <ClInclude Include="curl\lib\vauth\vauth.h" />
+    <ClInclude Include="curl\lib\vquic\curl_msh3.h" />
+    <ClInclude Include="curl\lib\vquic\curl_ngtcp2.h" />
+    <ClInclude Include="curl\lib\vquic\curl_quiche.h" />
     <ClInclude Include="curl\lib\vquic\vquic.h" />
+    <ClInclude Include="curl\lib\vquic\vquic_int.h" />
     <ClInclude Include="curl\lib\vssh\ssh.h" />
-    <ClInclude Include="curl\lib\vssh\wolfssh.h" />
     <ClInclude Include="curl\lib\vtls\bearssl.h" />
-    <ClInclude Include="curl\lib\vtls\gskit.h" />
     <ClInclude Include="curl\lib\vtls\gtls.h" />
+    <ClInclude Include="curl\lib\vtls\hostcheck.h" />
     <ClInclude Include="curl\lib\vtls\keylog.h" />
     <ClInclude Include="curl\lib\vtls\mbedtls.h" />
     <ClInclude Include="curl\lib\vtls\mbedtls_threadlock.h" />
-    <ClInclude Include="curl\lib\vtls\nssg.h" />
     <ClInclude Include="curl\lib\vtls\openssl.h" />
+    <ClInclude Include="curl\lib\vtls\rustls.h" />
     <ClInclude Include="curl\lib\vtls\schannel.h" />
+    <ClInclude Include="curl\lib\vtls\schannel_int.h" />
     <ClInclude Include="curl\lib\vtls\sectransp.h" />
     <ClInclude Include="curl\lib\vtls\vtls.h" />
+    <ClInclude Include="curl\lib\vtls\vtls_int.h" />
     <ClInclude Include="curl\lib\vtls\wolfssl.h" />
-    <ClInclude Include="curl\lib\ws.h" />
+    <ClInclude Include="curl\lib\vtls\x509asn1.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">