ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

X11DisplayDevice - Use XRRSizes array directly if dev.Bounds is empty

Browse source 
Directly indexing into the array returned from XRRSizes is the way khronos recommends at https://www.khronos.org/opengl/wiki/Programming_OpenGL_in_Linux:_Changing_the_Screen_Resolution

The old way was multiplying that index by depths.Length, as an index into the available_res list. This is incorrect because it doesn't account for when a display device has multiple refresh rates.
This commit is contained in:
UnknownShadow200 2017-08-08 00:13:23 +10:00 committed by GitHub
parent 178508ac0e
commit 84dc4d207c
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/OpenTK/Platform/X11/X11DisplayDevice.cs
View file

@ -171,7 +171,8 @@ namespace OpenTK.Platform.X11
int[] depths = FindAvailableDepths(screen); int[] depths = FindAvailableDepths(screen);
int resolution_count = 0; int resolution_count = 0;
foreach (XRRScreenSize size in FindAvailableResolutions(screen)) XRRScreenSize[] sizes = FindAvailableResolutions(screen);
foreach (XRRScreenSize size in sizes)
{ {
if (size.Width == 0 || size.Height == 0) if (size.Width == 0 || size.Height == 0)
{ {
@ -221,22 +222,11 @@ namespace OpenTK.Platform.X11
int current_depth = FindCurrentDepth(screen); int current_depth = FindCurrentDepth(screen);
IntPtr screen_config = Functions.XRRGetScreenInfo(API.DefaultDisplay, Functions.XRootWindow(API.DefaultDisplay, screen)); IntPtr screen_config = Functions.XRRGetScreenInfo(API.DefaultDisplay, Functions.XRootWindow(API.DefaultDisplay, screen));
ushort current_rotation; // Not needed. ushort current_rotation; // Not needed.
int current_resolution_index = Functions.XRRConfigCurrentConfiguration(screen_config, out current_rotation); int current_sizes_index = Functions.XRRConfigCurrentConfiguration(screen_config, out current_rotation);
if (dev.Bounds == Rectangle.Empty) if (dev.Bounds == Rectangle.Empty)
{ {
// We have added depths.Length copies of each resolution dev.Bounds = new Rectangle(0, 0, sizes[current_sizes_index].Width, sizes[current_sizes_index].Height);
// Adjust the return value of XRRGetScreenInfo to retrieve the correct resolution
int index = current_resolution_index * depths.Length;
// Make sure we are within the bounds of the available_res array
if (index >= available_res.Count)
{
// If not, use the return value of XRRGetScreenInfo directly
index = current_resolution_index;
}
DisplayResolution current_resolution = available_res[index];
dev.Bounds = new Rectangle(0, 0, current_resolution.Width, current_resolution.Height);
} }
dev.BitsPerPixel = current_depth; dev.BitsPerPixel = current_depth;
dev.RefreshRate = current_refresh_rate; dev.RefreshRate = current_refresh_rate;