ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-11 10:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win] Fix issue #35 (OpenTK over Remote Desktop)

Browse source 
When running over remote desktop without hardware acceleration, there
are no GraphicsModes that support desktop composition. This patch adds
logic to avoid requesting composition-capable modes when running over
RDP.

Additionally, it changes the mode selection logic to consider modes that
support features partially (e.g. 16bpp color instead of 32bpp), albeit
with a heavy penalty over fully supported modes.
This commit is contained in:
Stefanos A. 2014-01-09 00:14:25 +01:00
parent 1b3b510376
commit 28ac3cec0b
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Source/OpenTK/Platform/Windows/WinGraphicsMode.cs
View file

@ -216,15 +216,31 @@ namespace OpenTK.Platform.Windows
static bool Compare(int got, int requested, ref int distance) static bool Compare(int got, int requested, ref int distance)
{ {
if (got < requested) bool valid = true;
if (got == 0 && requested != 0)
{ {
return false; // mode does not support the requested feature.
valid = false;
}
else if (got >= requested)
{
// mode supports the requested feature,
// calculate the distance from an "ideal" mode
// that matches this feature exactly.
distance += got - requested;
} }
else else
{ {
distance += got - requested; // mode supports the requested feature,
return true; // but at a suboptimal level. For example:
// - requsted AA = 8x, got 4x
// - requested color = 32bpp, got 16bpp
// We can still use this mode but only if
// no better mode exists.
const int penalty = 8;
distance += penalty * Math.Abs(got - requested);
} }
return valid;
} }
static AccelerationType GetAccelerationType(ref PixelFormatDescriptor pfd) static AccelerationType GetAccelerationType(ref PixelFormatDescriptor pfd)
@ -262,8 +278,18 @@ namespace OpenTK.Platform.Windows
// Does not appear to be supported by DescribePixelFormat // Does not appear to be supported by DescribePixelFormat
//flags |= PixelFormatDescriptorFlags.DOUBLEBUFFER; //flags |= PixelFormatDescriptorFlags.DOUBLEBUFFER;
} }
if (System.Environment.OSVersion.Version.Major >= 6)
if (System.Environment.OSVersion.Version.Major >= 6 &&
requested_acceleration_type != AccelerationType.None)
{ {
// Request a compositor-capable mode when running on
// Vista+ and using hardware acceleration. Without this,
// some modes will cause the compositor to turn off,
// which is very annoying to the user.
// Note: compositor-capable modes require hardware
// acceleration. Don't set this flag when running
// with software acceleration (e.g. over Remote Desktop
// as described in bug https://github.com/opentk/opentk/issues/35)
flags |= PixelFormatDescriptorFlags.SUPPORT_COMPOSITION; flags |= PixelFormatDescriptorFlags.SUPPORT_COMPOSITION;
} }