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

Fixed GetModesARB implementation

Browse source 
The correct way to query number of available pixel formats is to use
Wgl.Arb.GetPixelFormatAttrib(NumberPixelFormatsArb), not
Wgl.Arb.ChoosePixelFormats. This fixes an issue where Intel drivers
would fail to report any pixel formats in GetModesARB, even when
WGL_ARB_pixel_format is supported.
This commit is contained in:
Stefanos A. 2013-12-18 14:16:49 +01:00
parent fb93f2af93
commit a57b4c4270
1 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,6 +155,11 @@ namespace OpenTK.Platform.Windows
#region GetModesARB #region GetModesARB
// Queries pixel formats through the WGL_ARB_pixel_format extension
// This method only returns accelerated formats. If no format offers
// hardware acceleration (e.g. we are running in a VM or in a remote desktop
// connection), this method will return 0 formats and we will fall back to
// GetModesPFD.
IEnumerable<GraphicsMode> GetModesARB(IntPtr device) IEnumerable<GraphicsMode> GetModesARB(IntPtr device)
{ {
// See http://www.opengl.org/registry/specs/ARB/wgl_pixel_format.txt // See http://www.opengl.org/registry/specs/ARB/wgl_pixel_format.txt
@ -166,6 +171,10 @@ namespace OpenTK.Platform.Windows
yield break; yield break;
} }
// Define the list of attributes we are interested in.
// We will use each available pixel format for these
// attributes using GetPixelFormatAttrib.
// The results will be stored in the 'values' array below.
int[] attribs = new int[] int[] attribs = new int[]
{ {
(int)WGL_ARB_pixel_format.AccelerationArb, (int)WGL_ARB_pixel_format.AccelerationArb,
@ -193,35 +202,31 @@ namespace OpenTK.Platform.Windows
0 0
}; };
// Allocate storage for the results of GetPixelFormatAttrib queries
int[] values = new int[attribs.Length]; int[] values = new int[attribs.Length];
int[] attribs_values = new int[]
{
(int)WGL_ARB_pixel_format.AccelerationArb,
(int)WGL_ARB_pixel_format.FullAccelerationArb,
(int)WGL_ARB_pixel_format.SupportOpenglArb, 1,
(int)WGL_ARB_pixel_format.DrawToWindowArb, 1,
0, 0
};
int[] num_formats = new int[1];
// Get the number of available formats // Get the number of available formats
if (Wgl.Arb.ChoosePixelFormat(device, attribs_values, null, 0, null, num_formats)) int num_formats;
int num_formats_attrib = (int)WGL_ARB_pixel_format.NumberPixelFormatsArb;
if (Wgl.Arb.GetPixelFormatAttrib(device, 0, 0, 1, ref num_formats_attrib, out num_formats))
{ {
// Create an array big enough to hold all available formats and get those formats for (int p = 1; p < num_formats; p++)
int[] pixel = new int[num_formats[0]];
if (Wgl.Arb.ChoosePixelFormat(device, attribs_values, null, pixel.Length, pixel, num_formats))
{ {
foreach (int p in pixel) // Get the format attributes for this pixel format
{
// Find out what we really got as a format:
if (!Wgl.Arb.GetPixelFormatAttrib(device, p, 0, attribs.Length - 1, attribs, values)) if (!Wgl.Arb.GetPixelFormatAttrib(device, p, 0, attribs.Length - 1, attribs, values))
{ {
Debug.Print("[Warning] Failed to detect attributes for PixelFormat:{0}.", p); Debug.Print("[Warning] Failed to detect attributes for PixelFormat:{0}.", p);
continue; continue;
} }
// Skip formats that don't offer full hardware acceleration
WGL_ARB_pixel_format acceleration = (WGL_ARB_pixel_format)attribs[0];
if (acceleration != WGL_ARB_pixel_format.FullAccelerationArb)
{
continue;
}
// Construct a new GraphicsMode to describe this format
GraphicsMode mode = new GraphicsMode(new IntPtr(p), GraphicsMode mode = new GraphicsMode(new IntPtr(p),
new ColorFormat(values[1], values[2], values[3], values[4]), new ColorFormat(values[1], values[2], values[3], values[4]),
values[6], values[6],
@ -235,7 +240,6 @@ namespace OpenTK.Platform.Windows
} }
} }
} }
}
#endregion #endregion