ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-06-20 05:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EGL] Egl.GetError() now returns ErrorCode

Browse source
This commit is contained in:
thefiddler 2014-06-25 09:17:20 +02:00
parent f9d20b5e3e
commit 5da5ac0fa7
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Source/OpenTK/Platform/Egl/Egl.cs
View file

@ -50,6 +50,24 @@ namespace OpenTK.Platform.Egl
VG = Egl.OPENVG_BIT, VG = Egl.OPENVG_BIT,
} }
enum ErrorCode
{
SUCCESS = 12288,
NOT_INITIALIZED = 12289,
BAD_ACCESS = 12290,
BAD_ALLOC = 12291,
BAD_ATTRIBUTE = 12292,
BAD_CONFIG = 12293,
BAD_CONTEXT = 12294,
BAD_CURRENT_SURFACE = 12295,
BAD_DISPLAY = 12296,
BAD_MATCH = 12297,
BAD_NATIVE_PIXMAP = 12298,
BAD_NATIVE_WINDOW = 12299,
BAD_PARAMETER = 12300,
BAD_SURFACE = 12301,
}
static partial class Egl static partial class Egl
{ {
public const int VERSION_1_0 = 1; public const int VERSION_1_0 = 1;
@ -60,20 +78,6 @@ namespace OpenTK.Platform.Egl
public const int FALSE = 0; public const int FALSE = 0;
public const int TRUE = 1; public const int TRUE = 1;
public const int DONT_CARE = -1; public const int DONT_CARE = -1;
public const int SUCCESS = 12288;
public const int NOT_INITIALIZED = 12289;
public const int BAD_ACCESS = 12290;
public const int BAD_ALLOC = 12291;
public const int BAD_ATTRIBUTE = 12292;
public const int BAD_CONFIG = 12293;
public const int BAD_CONTEXT = 12294;
public const int BAD_CURRENT_SURFACE = 12295;
public const int BAD_DISPLAY = 12296;
public const int BAD_MATCH = 12297;
public const int BAD_NATIVE_PIXMAP = 12298;
public const int BAD_NATIVE_WINDOW = 12299;
public const int BAD_PARAMETER = 12300;
public const int BAD_SURFACE = 12301;
public const int CONTEXT_LOST = 12302; public const int CONTEXT_LOST = 12302;
public const int BUFFER_SIZE = 12320; public const int BUFFER_SIZE = 12320;
public const int ALPHA_SIZE = 12321; public const int ALPHA_SIZE = 12321;
@ -178,7 +182,7 @@ namespace OpenTK.Platform.Egl
public const int ALPHA_FORMAT_PRE = VG_ALPHA_FORMAT_PRE; public const int ALPHA_FORMAT_PRE = VG_ALPHA_FORMAT_PRE;
[DllImportAttribute("libEGL.dll", EntryPoint = "eglGetError")] [DllImportAttribute("libEGL.dll", EntryPoint = "eglGetError")]
public static extern int GetError(); public static extern ErrorCode GetError();
[DllImportAttribute("libEGL.dll", EntryPoint = "eglGetDisplay")] [DllImportAttribute("libEGL.dll", EntryPoint = "eglGetDisplay")]
public static extern EGLDisplay GetDisplay(EGLNativeDisplayType display_id); public static extern EGLDisplay GetDisplay(EGLNativeDisplayType display_id);

3
Source/OpenTK/Platform/Egl/EglContext.cs
View file

@ -133,7 +133,8 @@ namespace OpenTK.Platform.Egl
if (Egl.SwapInterval(WindowInfo.Display, value)) if (Egl.SwapInterval(WindowInfo.Display, value))
swap_interval = value; swap_interval = value;
else else
Debug.Print("[Warning] Egl.SwapInterval({0}, {1}) failed.", WindowInfo.Display, value); Debug.Print("[Warning] Egl.SwapInterval({0}, {1}) failed. Error: {2}",
WindowInfo.Display, value, Egl.GetError());
} }
} }

2
Source/OpenTK/Platform/Linux/LinuxFactory.cs
View file

@ -83,7 +83,7 @@ namespace OpenTK.Platform.Linux
int major, minor; int major, minor;
if (!Egl.Initialize(display, out major, out minor)) if (!Egl.Initialize(display, out major, out minor))
{ {
int error = Egl.GetError(); ErrorCode error = Egl.GetError();
throw new NotSupportedException("[KMS] Failed to initialize EGL display. Error code: " + error); throw new NotSupportedException("[KMS] Failed to initialize EGL display. Error code: " + error);
} }
Debug.Print("[KMS] EGL {0}.{1} initialized successfully on display {2:x}", major, minor, display); Debug.Print("[KMS] EGL {0}.{1} initialized successfully on display {2:x}", major, minor, display);