mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-25 07:15:38 +00:00
Renamed Windows.API to Windows.Functions
This commit is contained in:
parent
9a4d7f1976
commit
5c3315f974
|
@ -68,7 +68,7 @@ namespace OpenTK.Platform.Windows
|
||||||
// Dynamically load the OpenGL32.dll in order to use the extension loading capabilities of Wgl.
|
// Dynamically load the OpenGL32.dll in order to use the extension loading capabilities of Wgl.
|
||||||
if (opengl32Handle == IntPtr.Zero)
|
if (opengl32Handle == IntPtr.Zero)
|
||||||
{
|
{
|
||||||
opengl32Handle = API.LoadLibrary(opengl32Name);
|
opengl32Handle = Functions.LoadLibrary(opengl32Name);
|
||||||
if (opengl32Handle == IntPtr.Zero)
|
if (opengl32Handle == IntPtr.Zero)
|
||||||
{
|
{
|
||||||
//System.Diagnostics.Debug.WriteLine("LoadLibrary({0}) set error code: {1}. Will not load extensions.", _dll_name, error_code);
|
//System.Diagnostics.Debug.WriteLine("LoadLibrary({0}) set error code: {1}. Will not load extensions.", _dll_name, error_code);
|
||||||
|
@ -83,7 +83,7 @@ namespace OpenTK.Platform.Windows
|
||||||
Debug.WriteLine(String.Format("Loaded opengl32.dll: {0}", opengl32Handle));
|
Debug.WriteLine(String.Format("Loaded opengl32.dll: {0}", opengl32Handle));
|
||||||
}
|
}
|
||||||
|
|
||||||
deviceContext = API.GetDC(this.windowInfo.Handle);
|
deviceContext = Functions.GetDC(this.windowInfo.Handle);
|
||||||
Debug.WriteLine(String.Format("Device context: {0}", deviceContext));
|
Debug.WriteLine(String.Format("Device context: {0}", deviceContext));
|
||||||
|
|
||||||
Debug.Write("Setting pixel format... ");
|
Debug.Write("Setting pixel format... ");
|
||||||
|
@ -151,12 +151,12 @@ namespace OpenTK.Platform.Windows
|
||||||
Debug.WriteLine(String.Format("done! (format: {0})", pixel));
|
Debug.WriteLine(String.Format("done! (format: {0})", pixel));
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
int pixel = API.ChoosePixelFormat(deviceContext, ref pixelFormat);
|
int pixel = Functions.ChoosePixelFormat(deviceContext, ref pixelFormat);
|
||||||
if (pixel == 0)
|
if (pixel == 0)
|
||||||
{
|
{
|
||||||
throw new ApplicationException("The requested pixel format is not supported by the hardware configuration.");
|
throw new ApplicationException("The requested pixel format is not supported by the hardware configuration.");
|
||||||
}
|
}
|
||||||
API.SetPixelFormat(deviceContext, pixel, ref pixelFormat);
|
Functions.SetPixelFormat(deviceContext, pixel, ref pixelFormat);
|
||||||
|
|
||||||
Debug.Print("done! (format: {0})", pixel);
|
Debug.Print("done! (format: {0})", pixel);
|
||||||
}
|
}
|
||||||
|
@ -245,7 +245,7 @@ namespace OpenTK.Platform.Windows
|
||||||
|
|
||||||
public void SwapBuffers()
|
public void SwapBuffers()
|
||||||
{
|
{
|
||||||
API.SwapBuffers(deviceContext);
|
Functions.SwapBuffers(deviceContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
@ -285,7 +285,7 @@ namespace OpenTK.Platform.Windows
|
||||||
IntPtr handle = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(DeviceMode)));
|
IntPtr handle = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(DeviceMode)));
|
||||||
Marshal.StructureToPtr(currentMode, handle, true);
|
Marshal.StructureToPtr(currentMode, handle, true);
|
||||||
|
|
||||||
done = (API.EnumDisplaySettings(null, index++, handle) != 0) ? false : true;
|
done = (Functions.EnumDisplaySettings(null, index++, handle) != 0) ? false : true;
|
||||||
int error = Marshal.GetLastWin32Error();
|
int error = Marshal.GetLastWin32Error();
|
||||||
|
|
||||||
Marshal.PtrToStructure(handle, currentMode);
|
Marshal.PtrToStructure(handle, currentMode);
|
||||||
|
@ -371,7 +371,7 @@ namespace OpenTK.Platform.Windows
|
||||||
|
|
||||||
if (deviceContext != IntPtr.Zero)
|
if (deviceContext != IntPtr.Zero)
|
||||||
{
|
{
|
||||||
if (!API.ReleaseDC(this.windowInfo.Handle, deviceContext))
|
if (!Functions.ReleaseDC(this.windowInfo.Handle, deviceContext))
|
||||||
{
|
{
|
||||||
//throw new ApplicationException("Could not release device context. Error: " + Marshal.GetLastWin32Error());
|
//throw new ApplicationException("Could not release device context. Error: " + Marshal.GetLastWin32Error());
|
||||||
//Debug.Print("Could not destroy the device context. Error: {0}", Marshal.GetLastWin32Error());
|
//Debug.Print("Could not destroy the device context. Error: {0}", Marshal.GetLastWin32Error());
|
||||||
|
@ -380,7 +380,7 @@ namespace OpenTK.Platform.Windows
|
||||||
|
|
||||||
if (opengl32Handle != IntPtr.Zero)
|
if (opengl32Handle != IntPtr.Zero)
|
||||||
{
|
{
|
||||||
if (!API.FreeLibrary(opengl32Handle))
|
if (!Functions.FreeLibrary(opengl32Handle))
|
||||||
{
|
{
|
||||||
//throw new ApplicationException("FreeLibray call failed ('opengl32.dll'), Error: " + Marshal.GetLastWin32Error());
|
//throw new ApplicationException("FreeLibray call failed ('opengl32.dll'), Error: " + Marshal.GetLastWin32Error());
|
||||||
//Debug.Print("Could not release {0}. Error: {1}", opengl32Name, Marshal.GetLastWin32Error());
|
//Debug.Print("Could not release {0}. Error: {1}", opengl32Name, Marshal.GetLastWin32Error());
|
||||||
|
|
|
@ -77,7 +77,7 @@ namespace OpenTK.Platform.Windows
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return !API.PeekMessage(ref msg, IntPtr.Zero, 0, 0, 0);
|
return !Functions.PeekMessage(ref msg, IntPtr.Zero, 0, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue