sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NoGUI: Move DRM display to GL context

Browse Source 
We don't use it for Vulkan.
This commit is contained in:
Connor McLaughlin
2021-02-04 19:32:47 +10:00
parent 8f9bbb0bba
commit 3e9fdf22bf
8 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/duckstation-nogui/drm_host_interface.cpp
View File

@ -60,30 +60,22 @@ void DRMHostInterface::FixIncompatibleSettings(bool display_osd_messages)
bool DRMHostInterface::CreatePlatformWindow(bool fullscreen)
{
Assert(!m_drm_display);
m_drm_display = std::make_unique<DRMDisplay>();
if (!m_drm_display->Initialize())
{
m_drm_display.reset();
return false;
}
SetImGuiKeyMap();
return true;
}
void DRMHostInterface::DestroyPlatformWindow()
{
m_drm_display.reset();
// nothing to destroy, it's all in the context
}
std::optional<WindowInfo> DRMHostInterface::GetPlatformWindowInfo()
{
// TODO: Set fullscreen resolution.
WindowInfo wi;
wi.type = WindowInfo::Type::DRM;
wi.display_connection = m_drm_display.get();
wi.surface_width = m_drm_display->GetWidth();
wi.surface_height = m_drm_display->GetHeight();
wi.type = WindowInfo::Type::Display;
wi.surface_width = 0;
wi.surface_height = 0;
wi.surface_format = WindowInfo::SurfaceFormat::Auto;
return wi;
}

3
src/duckstation-nogui/drm_host_interface.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "common/drm_display.h"
#include "nogui_host_interface.h"
#include <memory>
#include <vector>
@ -38,8 +37,6 @@ private:
void PollEvDevKeyboards();
void SetImGuiKeyMap();
std::unique_ptr<DRMDisplay> m_drm_display;
struct EvDevKeyboard
{
struct libevdev* obj;