[bp] v0.17.0-mac (#1048)

* Disable SDL features * Branch Sync
minecraft-linux · Oct 13, 2024 · afe4e50 · afe4e50
1 parent 9313767
commit afe4e50
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/ext/sdl3.cmake b/ext/sdl3.cmake
@@ -9,6 +9,8 @@ if(SDL3_VENDORED)
     set(SDL_RENDER OFF CACHE BOOL "" FORCE)
     set(SDL_DIALOG OFF CACHE BOOL "" FORCE)
     set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
+    set(SDL_VULKAN OFF CACHE BOOL "" FORCE)
+    set(SDL_METAL OFF CACHE BOOL "" FORCE)
     set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 CACHE STRING "" FORCE)
     add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
 else()

diff --git a/imgui b/imgui
diff --git a/libc-shim b/libc-shim
diff --git a/sdl3 b/sdl3
+53 −4		.github/workflows/build.yml
+16 −15		backends/imgui_impl_allegro5.cpp
+67 −66		backends/imgui_impl_dx10.cpp
+85 −73		backends/imgui_impl_dx11.cpp
+12 −0		backends/imgui_impl_dx11.h
+43 −46		backends/imgui_impl_dx12.cpp
+11 −5		backends/imgui_impl_dx12.h
+80 −71		backends/imgui_impl_dx9.cpp
+34 −4		backends/imgui_impl_glfw.cpp
+10 −10		backends/imgui_impl_metal.mm
+9 −6		backends/imgui_impl_opengl2.cpp
+13 −10		backends/imgui_impl_opengl3.cpp
+6 −0		backends/imgui_impl_opengl3_loader.h
+3 −1		backends/imgui_impl_osx.mm
+10 −1		backends/imgui_impl_sdl2.cpp
+7 −4		backends/imgui_impl_sdl3.cpp
+1 −1		backends/imgui_impl_sdl3.h
+19 −8		backends/imgui_impl_sdlrenderer2.cpp
+9 −0		backends/imgui_impl_sdlrenderer2.h
+23 −10		backends/imgui_impl_sdlrenderer3.cpp
+11 −0		backends/imgui_impl_sdlrenderer3.h
+31 −27		backends/imgui_impl_vulkan.cpp
+21 −13		backends/imgui_impl_vulkan.h
+58 −16		backends/imgui_impl_wgpu.cpp
+17 −0		backends/imgui_impl_wgpu.h
+20 −12		backends/imgui_impl_win32.cpp
+1 −1		docs/BACKENDS.md
+205 −24		docs/CHANGELOG.txt
+28 −26		docs/FAQ.md
+5 −1		docs/FONTS.md
+4 −4		docs/README.md
+2 −4		docs/TODO.txt
+1 −1		examples/example_glfw_vulkan/CMakeLists.txt
+2 −2		examples/example_glfw_vulkan/build_win32.bat
+2 −2		examples/example_glfw_vulkan/build_win64.bat
+4 −4		examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj
+5 −1		examples/example_glfw_wgpu/CMakeLists.txt
+1 −1		examples/example_null/Makefile
+1 −1		examples/example_sdl2_vulkan/build_win32.bat
+5 −5		examples/example_sdl2_vulkan/example_sdl2_vulkan.vcxproj
+1 −1		examples/example_sdl3_opengl3/main.cpp
+1 −1		examples/example_sdl3_sdlrenderer3/main.cpp
+1 −2		examples/example_win32_directx12/build_win32.bat
+5 −5		examples/example_win32_directx12/example_win32_directx12.vcxproj
+0 −4		examples/example_win32_directx12/main.cpp
+679 −198		imgui.cpp
+78 −28		imgui.h
+69 −11		imgui_demo.cpp
+32 −5		imgui_draw.cpp
+128 −291		imgui_internal.h
+27 −23		imgui_tables.cpp
+353 −243		imgui_widgets.cpp
+63 −35		imstb_textedit.h
+7 −0		src/common.cpp
+2 −0		src/common.h
+17 −0		src/file_misc.cpp
+2 −0		src/file_misc.h
+10 −0		src/network.cpp