godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-31 18:41:20 +00:00
Code Releases Wiki Activity

Merge pull request #113741 from blueskythlikesclouds/rd-vulkan-fallback-fix

Browse Source 
Fix Vulkan failing to initialize when compiling without D3D12.
This commit is contained in:
Thaddeus Crews
2025-12-08 11:53:58 -06:00
parent 979b619130 7205e21915
commit 5cd9d2d9be
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/windows/display_server_windows.cpp
View File

@@ -1625,7 +1625,7 @@ DisplayServer::WindowID DisplayServerWindows::create_sub_window(WindowMode p_mod
#ifdef RD_ENABLED
if (rendering_context != nullptr) {
_create_rendering_context_window(window_id);
_create_rendering_context_window(window_id, rendering_driver);
}
#endif
#ifdef GLES3_ENABLED
@@ -6606,7 +6606,7 @@ void DisplayServerWindows::_destroy_window(WindowID p_window_id) {
}
#ifdef RD_ENABLED
Error DisplayServerWindows::_create_rendering_context_window(WindowID p_window_id) {
Error DisplayServerWindows::_create_rendering_context_window(WindowID p_window_id, const String &p_rendering_driver) {
DEV_ASSERT(rendering_context != nullptr);
WindowData &wd = windows[p_window_id];
@@ -6620,19 +6620,19 @@ Error DisplayServerWindows::_create_rendering_context_window(WindowID p_window_i
#endif
} wpd;
#ifdef VULKAN_ENABLED
if (rendering_driver == "vulkan") {
if (p_rendering_driver == "vulkan") {
wpd.vulkan.window = wd.hWnd;
wpd.vulkan.instance = hInstance;
}
#endif
#ifdef D3D12_ENABLED
if (rendering_driver == "d3d12") {
if (p_rendering_driver == "d3d12") {
wpd.d3d12.window = wd.hWnd;
}
#endif
Error err = rendering_context->window_create(p_window_id, &wpd);
ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to create %s window.", rendering_driver));
ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to create %s window.", p_rendering_driver));
rendering_context->window_set_size(p_window_id, wd.width, wd.height);
wd.rendering_context_window_created = true;
@@ -7224,7 +7224,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
main_window_created = true;
}
if (_create_rendering_context_window(MAIN_WINDOW_ID) == OK) {
if (_create_rendering_context_window(MAIN_WINDOW_ID, tested_rendering_driver) == OK) {
rendering_device = memnew(RenderingDevice);
if (rendering_device->initialize(rendering_context, MAIN_WINDOW_ID) == OK) {
#ifdef VULKAN_ENABLED

2
platform/windows/display_server_windows.h
View File

@@ -393,7 +393,7 @@ class DisplayServerWindows : public DisplayServer {
void _destroy_window(WindowID p_window_id); // Destroys only what was needed to be created for the main window. Does not destroy transient parent dependencies or GL/rendering context windows.
#ifdef RD_ENABLED
Error _create_rendering_context_window(WindowID p_window_id);
Error _create_rendering_context_window(WindowID p_window_id, const String &p_rendering_driver);
void _destroy_rendering_context_window(WindowID p_window_id);
#endif