Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-31 11:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GL: Fix window resize not applying under Wayland

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-26 00:58:21 +10:00
parent 900c01d16f
commit e147327459
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/common/gl/context_egl_wayland.cpp
View file

@ -5,7 +5,11 @@ Log_SetChannel(GL::ContextEGLWayland);
namespace GL { namespace GL {
ContextEGLWayland::ContextEGLWayland(const WindowInfo& wi) : ContextEGL(wi) {} ContextEGLWayland::ContextEGLWayland(const WindowInfo& wi) : ContextEGL(wi) {}
ContextEGLWayland::~ContextEGLWayland() = default; ContextEGLWayland::~ContextEGLWayland()
{
if (m_wl_window)
wl_egl_window_destroy(m_wl_window);
}
std::unique_ptr<Context> ContextEGLWayland::Create(const WindowInfo& wi, const Version* versions_to_try, std::unique_ptr<Context> ContextEGLWayland::Create(const WindowInfo& wi, const Version* versions_to_try,
size_t num_versions_to_try) size_t num_versions_to_try)
@ -28,13 +32,27 @@ std::unique_ptr<Context> ContextEGLWayland::CreateSharedContext(const WindowInfo
return context; return context;
} }
void ContextEGLWayland::ResizeSurface(u32 new_surface_width, u32 new_surface_height)
{
if (m_wl_window)
wl_egl_window_resize(m_wl_window, new_surface_width, new_surface_height, 0, 0);
ContextEGL::ResizeSurface(new_surface_width, new_surface_height);
}
EGLNativeWindowType ContextEGLWayland::GetNativeWindow(EGLConfig config) EGLNativeWindowType ContextEGLWayland::GetNativeWindow(EGLConfig config)
{ {
wl_egl_window* window = if (m_wl_window)
{
wl_egl_window_destroy(m_wl_window);
m_wl_window = nullptr;
}
m_wl_window =
wl_egl_window_create(static_cast<wl_surface*>(m_wi.window_handle), m_wi.surface_width, m_wi.surface_height); wl_egl_window_create(static_cast<wl_surface*>(m_wi.window_handle), m_wi.surface_width, m_wi.surface_height);
if (!window) if (!m_wl_window)
return {}; return {};
return reinterpret_cast<EGLNativeWindowType>(window); return reinterpret_cast<EGLNativeWindowType>(m_wl_window);
} }
} // namespace GL } // namespace GL

5
src/common/gl/context_egl_wayland.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "context_egl.h" #include "context_egl.h"
#include <wayland-egl.h>
namespace GL { namespace GL {
@ -13,9 +14,13 @@ public:
size_t num_versions_to_try); size_t num_versions_to_try);
std::unique_ptr<Context> CreateSharedContext(const WindowInfo& wi) override; std::unique_ptr<Context> CreateSharedContext(const WindowInfo& wi) override;
void ResizeSurface(u32 new_surface_width = 0, u32 new_surface_height = 0) override;
protected: protected:
EGLNativeWindowType GetNativeWindow(EGLConfig config) override; EGLNativeWindowType GetNativeWindow(EGLConfig config) override;
private:
wl_egl_window* m_wl_window = nullptr;
}; };
} // namespace GL } // namespace GL