Merge branch 'dev'

SimoneN64 · May 26, 2024 · 1808afe · 1808afe
2 parents 83f3571 + 9721042
commit 1808afe
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/external/nativefiledialog-extended b/external/nativefiledialog-extended
diff --git a/external/parallel-rdp/CMakeLists.txt b/external/parallel-rdp/CMakeLists.txt
@@ -41,6 +41,8 @@ add_library(parallel-rdp
   parallel-rdp-standalone/util/logging.hpp
   parallel-rdp-standalone/util/thread_id.cpp
   parallel-rdp-standalone/util/thread_id.hpp
+  parallel-rdp-standalone/util/environment.cpp
+  parallel-rdp-standalone/util/environment.hpp
   # C
   parallel-rdp-standalone/volk/volk.c
 )

diff --git a/external/parallel-rdp/parallel-rdp-standalone b/external/parallel-rdp/parallel-rdp-standalone
diff --git a/external/unarr b/external/unarr
diff --git a/src/frontend/RenderWidget.hpp b/src/frontend/RenderWidget.hpp
@@ -72,6 +72,7 @@ class QtWSIPlatform final : public Vulkan::WSIPlatform {
   }
 
   void poll_input() override {}
+  void poll_input_async(Granite::InputTrackerHandler* handler) override {}
 
   void event_frame_tick(double frame, double elapsed) override { }
+0 −24		.circleci/config.yml
+18 −3		.github/workflows/cmake.yml
+2 −2		CMakeLists.txt
+11 −1		README.md
+4 −0		src/CMakeLists.txt
+209 −175		src/include/nfd.h
+64 −0		src/nfd_cocoa.m
+35 −0		src/nfd_gtk.cpp
+48 −12		src/nfd_portal.cpp
+977 −969		src/nfd_win.cpp
+7 −2		test/CMakeLists.txt
+49 −0		test/test_opendialog_native.c
+62 −0		test/test_opendialogmultiple_enum_native.c
+59 −0		test/test_opendialogmultiple_native.c
+42 −0		test/test_pickfolder_native.c
+55 −0		test/test_savedialog_native.c
+1 −1		COMMIT
+1 −0		config.mk
+2 −0		parallel-rdp/rdp_data_structures.hpp
+32 −27		parallel-rdp/rdp_renderer.cpp
+1 −0		parallel-rdp/shaders/data_structures.h
+8 −0		parallel-rdp/shaders/shading.h
+53,828 −48,641		parallel-rdp/shaders/slangmosh.hpp
+6 −6		parallel-rdp/video_interface.cpp
+1 −0		util/aligned_alloc.cpp
+126 −0		util/arena_allocator.cpp
+74 −12		util/arena_allocator.hpp
+7 −0		util/bitops.hpp
+59 −0		util/dynamic_array.hpp
+96 −0		util/environment.cpp
+35 −0		util/environment.hpp
+12 −4		util/temporary_hashmap.hpp
+19 −2		util/thread_name.cpp
+22 −2		util/timeline_trace_file.cpp
+9 −3		util/timeline_trace_file.hpp
+459 −189		volk/volk.c
+305 −129		volk/volk.h
+392 −0		vulkan-headers/include/vk_video/vulkan_video_codec_av1std.h
+109 −0		vulkan-headers/include/vk_video/vulkan_video_codec_av1std_decode.h
+4 −2		vulkan-headers/include/vk_video/vulkan_video_codec_h264std.h
+4 −2		vulkan-headers/include/vk_video/vulkan_video_codec_h264std_decode.h
+36 −30		vulkan-headers/include/vk_video/vulkan_video_codec_h264std_encode.h
+9 −6		vulkan-headers/include/vk_video/vulkan_video_codec_h265std.h
+4 −2		vulkan-headers/include/vk_video/vulkan_video_codec_h265std_decode.h
+58 −51		vulkan-headers/include/vk_video/vulkan_video_codec_h265std_encode.h
+6 −1		vulkan-headers/include/vk_video/vulkan_video_codecs_common.h
+4 −18		vulkan-headers/include/vulkan/vk_icd.h
+4 −18		vulkan-headers/include/vulkan/vk_layer.h
+1 −1		vulkan-headers/include/vulkan/vk_platform.h
+1 −1		vulkan-headers/include/vulkan/vulkan.h
+29 −1		vulkan-headers/include/vulkan/vulkan_android.h
+108 −429		vulkan-headers/include/vulkan/vulkan_beta.h
+2,737 −277		vulkan-headers/include/vulkan/vulkan_core.h
+2 −1		vulkan-headers/include/vulkan/vulkan_directfb.h
+5 −1		vulkan-headers/include/vulkan/vulkan_fuchsia.h
+3 −1		vulkan-headers/include/vulkan/vulkan_ggp.h
+2 −1		vulkan-headers/include/vulkan/vulkan_ios.h
+2 −1		vulkan-headers/include/vulkan/vulkan_macos.h
+3 −1		vulkan-headers/include/vulkan/vulkan_metal.h
+55 −1		vulkan-headers/include/vulkan/vulkan_screen.h
+2 −1		vulkan-headers/include/vulkan/vulkan_vi.h
+2 −1		vulkan-headers/include/vulkan/vulkan_wayland.h
+10 −1		vulkan-headers/include/vulkan/vulkan_win32.h
+2 −1		vulkan-headers/include/vulkan/vulkan_xcb.h
+2 −1		vulkan-headers/include/vulkan/vulkan_xlib.h
+2 −1		vulkan-headers/include/vulkan/vulkan_xlib_xrandr.h
+1 −0		vulkan/buffer.hpp
+31 −29		vulkan/buffer_pool.cpp
+16 −22		vulkan/buffer_pool.hpp
+105 −134		vulkan/command_buffer.cpp
+12 −20		vulkan/command_buffer.hpp
+310 −369		vulkan/context.cpp
+35 −45		vulkan/context.hpp
+36 −24		vulkan/descriptor_set.cpp
+10 −7		vulkan/descriptor_set.hpp
+155 −322		vulkan/device.cpp
+11 −16		vulkan/device.hpp
+37 −29		vulkan/device_fossilize.cpp
+1 −1		vulkan/device_fossilize.hpp
+5 −5		vulkan/fence.cpp
+0 −6		vulkan/image.hpp
+6 −0		vulkan/indirect_layout.cpp
+7 −0		vulkan/indirect_layout.hpp
+1 −1		vulkan/limits.hpp
+6 −3		vulkan/memory_allocator.cpp
+2 −1		vulkan/memory_allocator.hpp
+7 −11		vulkan/query_pool.cpp
+0 −2		vulkan/quirks.hpp
+47 −28		vulkan/render_pass.cpp
+9 −8		vulkan/render_pass.hpp
+1 −1		vulkan/sampler.cpp
+20 −3		vulkan/semaphore.cpp
+3 −0		vulkan/semaphore.hpp
+7 −1		vulkan/shader.cpp
+0 −2		vulkan/vulkan_common.hpp
+331 −74		vulkan/wsi.cpp
+33 −3		vulkan/wsi.hpp
+15 −0		.editorconfig
+3 −0		.gitignore
+11 −1		CHANGELOG.md
+105 −89		CMakeLists.txt
+8 −25		README.md
+2 −2		_7z/_7z.c
+1 −1		_7z/_7z.h
+6 −6		lzmasdk/7z.h
+204 −201		lzmasdk/7zArcIn.c
+3 −3		lzmasdk/7zBuf.h
+8 −6		lzmasdk/7zCrc.h
+110 −62		lzmasdk/7zDec.c
+45 −22		lzmasdk/7zStream.c
+175 −104		lzmasdk/7zTypes.h
+101 −0		lzmasdk/7zWindows.h
+176 −143		lzmasdk/Bcj2.c
+228 −42		lzmasdk/Bcj2.h
+343 −153		lzmasdk/Bra.c
+75 −40		lzmasdk/Bra.h
+163 −58		lzmasdk/Bra86.c
+0 −53		lzmasdk/BraIA64.c
+139 −23		lzmasdk/Compiler.h
+570 −225		lzmasdk/CpuArch.c
+157 −83		lzmasdk/CpuArch.h
+3 −3		lzmasdk/Delta.h
+7 −5		lzmasdk/Lzma2Dec.c
+8 −7		lzmasdk/Lzma2Dec.h
+95 −95		lzmasdk/LzmaDec.c
+9 −8		lzmasdk/LzmaDec.h
+7 −5		lzmasdk/Ppmd.h
+102 −84		lzmasdk/Ppmd7.c
+10 −10		lzmasdk/Ppmd7.h
+36 −21		lzmasdk/Ppmd7Dec.c
+35 −19		lzmasdk/Ppmd7aDec.c
+138 −110		lzmasdk/Ppmd8.c
+37 −21		lzmasdk/Ppmd8Dec.c
+3 −3		lzmasdk/Precomp.h
+50 −0		lzmasdk/RotateDefs.h
+6 −8		rar/filter-rar.c
+53 −23		test/CMakeLists.txt
+ −		test/corpus/integration/lipsum_7z_default.7z
+ −		test/corpus/integration/lipsum_7z_lzma1.7z
+ −		test/corpus/integration/lipsum_7z_max.7z
+ −		test/corpus/integration/lipsum_7z_ppmd.7z
+ −		test/corpus/integration/lipsum_rar4_default.rar
+ −		test/corpus/integration/lipsum_rar4_delta.rar
+ −		test/corpus/integration/lipsum_rar4_max.rar
+ −		test/corpus/integration/lipsum_rar4_ppmd.rar
+ −		test/corpus/integration/lipsum_zip_bzip2.zip
+ −		test/corpus/integration/lipsum_zip_default.zip
+ −		test/corpus/integration/lipsum_zip_deflate64.zip
+ −		test/corpus/integration/lipsum_zip_lzma1.zip
+ −		test/corpus/integration/lipsum_zip_max.zip
+ −		test/corpus/integration/lipsum_zip_ppmd.zip
+ −		test/corpus/integration/lipsum_zip_xz.zip
+ −		test/corpus/integration/silent_rar4_audio.rar
+ −		test/corpus/src/silent_quarter-second.wav
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ class QtWSIPlatform final : public Vulkan::WSIPlatform { @@
       }
       void poll_input() override {}
+      void poll_input_async(Granite::InputTrackerHandler* handler) override {}
       void event_frame_tick(double frame, double elapsed) override { }
@@ Expand Down @@