thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: HiDPI support in OpenGL backend

Browse source
This commit is contained in:
Eugene Sandulenko 2020-10-29 19:12:24 +01:00
parent b29f457548
commit 5e395d166a
7 changed files with 83 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -287,7 +287,7 @@ void OpenGLSdlGraphicsManager::updateScreen() {
void OpenGLSdlGraphicsManager::notifyVideoExpose() {
}
void OpenGLSdlGraphicsManager::notifyResize(const int width, const int height) {
void OpenGLSdlGraphicsManager::notifyResize(const int w, const int h) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
// We sometime get outdated resize events from SDL2. So check that the size we get
// is the actual current window size. If not ignore the resize.
@ -298,9 +298,14 @@ void OpenGLSdlGraphicsManager::notifyResize(const int width, const int height) {
// event is processed after recreating the window at the new resolution.
int currentWidth, currentHeight;
getWindowSizeFromSdl(&currentWidth, &currentHeight);
uint scale;
getDpiScalingFactor(&scale);
int width = w * scale;
int height = h * scale;
debug(3, "req: %d x %d cur: %d x %d, scale: %d", width, height, currentWidth, currentHeight, scale);
if (width != currentWidth || height != currentHeight)
return;
// TODO: Implement high DPI support
handleResize(width, height, 90, 90);
#else
if (!_ignoreResizeEvents && _hwScreen && !(_hwScreen->flags & SDL_FULLSCREEN)) {
@ -422,7 +427,8 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
_glContext = nullptr;
}
uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
if (_wantsFullScreen) {
// On Linux/X11, when toggling to fullscreen, the window manager saves
// the window size to be able to restore it when going back to windowed mode.
@ -459,8 +465,8 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
notifyContextCreate(rgba8888, rgba8888);
int actualWidth, actualHeight;
getWindowSizeFromSdl(&actualWidth, &actualHeight);
// TODO: Implement high DPI support
handleResize(actualWidth, actualHeight, 90, 90);
handleResize(actualWidth, actualHeight, 72, 72);
return true;
#else
// WORKAROUND: Working around infamous SDL bugs when switching
@ -507,6 +513,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
if (_hwScreen) {
notifyContextCreate(rgba8888, rgba8888);
// TODO: hidpi
handleResize(_hwScreen->w, _hwScreen->h, 90, 90);
}