Skip to content

Bump to upstream plume #216

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.

Sign up for GitHub

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

Merged
IsaacMarovitz merged 3 commits into from
Jan 13, 2026
Merged

Bump to upstream plume #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e428d6
Bump to upstream plume
IsaacMarovitz Jan 13, 2026
2aa433c
Fix Plume variable renames
IsaacMarovitz Jan 13, 2026
3ea25ed
Add missed changes
IsaacMarovitz Jan 13, 2026
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
13 changes: 10 additions & 3 deletions MarathonRecomp/gpu/video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ namespace plume
#ifdef MARATHON_RECOMP_METAL
extern std::unique_ptr<RenderInterface> CreateMetalInterface();
#endif
#ifdef SDL_VULKAN_ENABLED
#ifdef PLUME_SDL_VULKAN_ENABLED
extern std::unique_ptr<RenderInterface> CreateVulkanInterface(RenderWindow sdlWindow);
#else
extern std::unique_ptr<RenderInterface> CreateVulkanInterface();
#endif

static std::unique_ptr<RenderInterface> CreateVulkanInterfaceWrapper() {
#ifdef SDL_VULKAN_ENABLED
#ifdef PLUME_SDL_VULKAN_ENABLED
return CreateVulkanInterface(GameWindow::s_renderWindow);
#else
return CreateVulkanInterface();
Expand Down Expand Up @@ -2061,7 +2061,14 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver, bool graphicsApiRetry)
break;
}

g_swapChain = g_queue->createSwapChain(GameWindow::s_renderWindow, bufferCount, BACKBUFFER_FORMAT, Config::MaxFrameLatency);
RenderSwapChainDesc swapChainDesc;
swapChainDesc.renderWindow = GameWindow::s_renderWindow;
swapChainDesc.textureCount = bufferCount;
swapChainDesc.format = BACKBUFFER_FORMAT;
swapChainDesc.maxFrameLatency = Config::MaxFrameLatency;
swapChainDesc.enablePresentWait = g_capabilities.presentWait;

g_swapChain = g_queue->createSwapChain(swapChainDesc);
g_swapChain->setVsyncEnabled(Config::VSync);
g_swapChainValid = !g_swapChain->needsResize();

Expand Down
4 changes: 2 additions & 2 deletions MarathonRecomp/ui/game_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void GameWindow::Init(const char* sdlVideoDriver)
DWM_WINDOW_CORNER_PREFERENCE wcp = DWMWCP_DONOTROUND;
DwmSetWindowAttribute(s_renderWindow, DWMWA_WINDOW_CORNER_PREFERENCE, &wcp, sizeof(wcp));
}
#elif defined(SDL_VULKAN_ENABLED)
#elif defined(PLUME_SDL_VULKAN_ENABLED)
s_renderWindow = s_pWindow;
#elif defined(__linux__)
s_renderWindow = { info.info.x11.display, info.info.x11.window };
Expand Down Expand Up @@ -439,7 +439,7 @@ uint32_t GameWindow::GetWindowFlags()
if (Config::Fullscreen)
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;

#ifdef SDL_VULKAN_ENABLED
#ifdef PLUME_SDL_VULKAN_ENABLED
flags |= SDL_WINDOW_VULKAN;
#endif

Expand Down
4 changes: 2 additions & 2 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ set(SDL2MIXER_VORBIS "VORBISFILE")
set(SDL2MIXER_WAVPACK OFF)

if (CMAKE_SYSTEM_NAME MATCHES "Linux")
set(SDL_VULKAN_ENABLED ON CACHE BOOL "")
set(PLUME_SDL_VULKAN_ENABLED ON CACHE BOOL "")
endif()

if (WIN32)
set(D3D12_AGILITY_SDK_ENABLED ON CACHE BOOL "")
set(PLUME_D3D12_AGILITY_SDK_ENABLED ON CACHE BOOL "")
endif()

if (APPLE AND CMAKE_OSX_ARCHITECTURES)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/plume
Open in desktop
Submodule plume updated 29 files
+22 −16 CMakeLists.txt
+4 −17 examples/CMakeLists.txt
+275 −0 examples/cmake/PlumeShaders.cmake
+0 −219 examples/cmake/ShaderCompilation.cmake
+104 −0 examples/cmake/modules/PlumeDXC.cmake
+46 −0 examples/cmake/modules/PlumeFileToC.cmake
+90 −0 examples/cmake/modules/PlumeSpirvCross.cmake
+105 −0 examples/cmake/tools/file_to_c.cpp
+184 −0 examples/cmake/tools/spirv_cross_msl.cpp
+3 −8 examples/cube/CMakeLists.txt
+77 −77 examples/cube/main.cpp
+0 −23 examples/cube/shaders/cube.frag.metal
+0 −44 examples/cube/shaders/cube.vert.metal
+0 −1 examples/tools/CMakeLists.txt
+0 −14 examples/tools/file_to_c/CMakeLists.txt
+0 −80 examples/tools/file_to_c/file_to_c.cpp
+3 −8 examples/triangle/CMakeLists.txt
+48 −48 examples/triangle/main.cpp
+0 −13 examples/triangle/shaders/triangle.frag.metal
+0 −22 examples/triangle/shaders/triangle.vert.metal
+1 −1 plume_apple.mm
+78 −43 plume_d3d12.cpp
+11 −11 plume_d3d12.h
+167 −68 plume_metal.cpp
+74 −35 plume_metal.h
+1 −1 plume_render_interface.h
+24 −3 plume_render_interface_types.h
+60 −50 plume_vulkan.cpp
+5 −7 plume_vulkan.h
Loading