Minor code cleanup
No need to wrap Wgl.DescribePixelFormat, just call it directly.
This commit is contained in:
parent
9129e62343
commit
f4f793a5d3
1 changed files with 2 additions and 12 deletions
|
@ -105,17 +105,6 @@ namespace OpenTK.Platform.Windows
|
||||||
|
|
||||||
#region Private Methods
|
#region Private Methods
|
||||||
|
|
||||||
#region DescribePixelFormat
|
|
||||||
|
|
||||||
static int DescribePixelFormat(IntPtr hdc, int ipfd, int cjpfd, ref PixelFormatDescriptor pfd)
|
|
||||||
{
|
|
||||||
// Note: DescribePixelFormat found in gdi32 is extremely slow
|
|
||||||
// on nvidia, for some reason.
|
|
||||||
return Wgl.DescribePixelFormat(hdc, ipfd, (uint)cjpfd, out pfd);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region GetModesPFD
|
#region GetModesPFD
|
||||||
|
|
||||||
IEnumerable<GraphicsMode> GetModesPFD(IntPtr device)
|
IEnumerable<GraphicsMode> GetModesPFD(IntPtr device)
|
||||||
|
@ -140,8 +129,9 @@ namespace OpenTK.Platform.Windows
|
||||||
{
|
{
|
||||||
// Iterate through all accelerated formats first. Afterwards, iterate through non-accelerated formats.
|
// Iterate through all accelerated formats first. Afterwards, iterate through non-accelerated formats.
|
||||||
// This should fix issue #2224, which causes OpenTK to fail on VMs without hardware acceleration.
|
// This should fix issue #2224, which causes OpenTK to fail on VMs without hardware acceleration.
|
||||||
|
// Note: DescribePixelFormat found in gdi32 is extremely slow on nvidia, for some reason.
|
||||||
int pixel = 0;
|
int pixel = 0;
|
||||||
while (DescribePixelFormat(device, ++pixel, API.PixelFormatDescriptorSize, ref pfd) != 0)
|
while (Wgl.DescribePixelFormat(device, ++pixel, API.PixelFormatDescriptorSize, ref pfd) != 0)
|
||||||
{
|
{
|
||||||
// Ignore non-accelerated formats.
|
// Ignore non-accelerated formats.
|
||||||
if (!generic_allowed && (pfd.Flags & PixelFormatDescriptorFlags.GENERIC_FORMAT) != 0)
|
if (!generic_allowed && (pfd.Flags & PixelFormatDescriptorFlags.GENERIC_FORMAT) != 0)
|
||||||
|
|
Loading…
Reference in a new issue