diff options
author | Yuri Sizov <11782833+YuriSizov@users.noreply.github.com> | 2023-07-20 16:28:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-20 16:28:47 +0200 |
commit | dd05012122f77a915e4ba9dd6b43bae878667fbc (patch) | |
tree | 5b16f4e8322344799824de06a958ec33bb3b5b69 /servers/rendering/rendering_server_default.cpp | |
parent | e8af22d3de637e59f5cf1c75cb89f725b6cfd713 (diff) | |
parent | 0a64abe891a3c0d1379c2c23c0f968dba643a324 (diff) | |
download | redot-engine-dd05012122f77a915e4ba9dd6b43bae878667fbc.tar.gz |
Merge pull request #79528 from univeous/video_adapter_fix
Fix crash when calling `get_video_adapter_*` in a thread
Diffstat (limited to 'servers/rendering/rendering_server_default.cpp')
-rw-r--r-- | servers/rendering/rendering_server_default.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/servers/rendering/rendering_server_default.cpp b/servers/rendering/rendering_server_default.cpp index 65bdb94c9f..ff6bf3a6ba 100644 --- a/servers/rendering/rendering_server_default.cpp +++ b/servers/rendering/rendering_server_default.cpp @@ -258,22 +258,10 @@ uint64_t RenderingServerDefault::get_rendering_info(RenderingInfo p_info) { return RSG::utilities->get_rendering_info(p_info); } -String RenderingServerDefault::get_video_adapter_name() const { - return RSG::utilities->get_video_adapter_name(); -} - -String RenderingServerDefault::get_video_adapter_vendor() const { - return RSG::utilities->get_video_adapter_vendor(); -} - RenderingDevice::DeviceType RenderingServerDefault::get_video_adapter_type() const { return RSG::utilities->get_video_adapter_type(); } -String RenderingServerDefault::get_video_adapter_api_version() const { - return RSG::utilities->get_video_adapter_api_version(); -} - void RenderingServerDefault::set_frame_profiling_enabled(bool p_enable) { RSG::utilities->capturing_timestamps = p_enable; } |