Merge pull request #404 from SiliconStudio/context_tostring_fixes

Context tostring fixes
This commit is contained in:
Harry 2016-07-16 13:28:05 +02:00 committed by GitHub
commit edd117e3a5
2 changed files with 4 additions and 4 deletions

View file

@ -141,8 +141,8 @@ namespace OpenTK.Graphics
public override string ToString() public override string ToString()
{ {
return string.Format("[{0}: IsCurrent={1}, IsDisposed={2}, VSync={3}, SwapInterval={4}, GraphicsMode={5}, ErrorChecking={6}, Implementation={7}, Context={8}]", return string.Format("[{0}: IsCurrent={1}, IsDisposed={2}, VSync={3}, SwapInterval={4}, GraphicsMode={5}, Context={6}]",
GetType().Name, IsCurrent, IsDisposed, VSync, SwapInterval, GraphicsMode, ErrorChecking, Implementation, Context); GetType().Name, IsCurrent, IsDisposed, VSync, SwapInterval, GraphicsMode, Context);
} }
public override int GetHashCode() public override int GetHashCode()

View file

@ -117,7 +117,7 @@ namespace OpenTK.Platform.Egl
{ {
if (!Egl.SwapBuffers(WindowInfo.Display, WindowInfo.Surface)) if (!Egl.SwapBuffers(WindowInfo.Display, WindowInfo.Surface))
{ {
throw new GraphicsContextException(string.Format("Failed to swap buffers for context {0} current. Error: {1}", this, Egl.GetError())); throw new GraphicsContextException(string.Format("Failed to swap buffers for context {0} current. Error: {1}", Handle, Egl.GetError()));
} }
} }
@ -133,7 +133,7 @@ namespace OpenTK.Platform.Egl
WindowInfo = (EglWindowInfo) window; WindowInfo = (EglWindowInfo) window;
if (!Egl.MakeCurrent(WindowInfo.Display, WindowInfo.Surface, WindowInfo.Surface, HandleAsEGLContext)) if (!Egl.MakeCurrent(WindowInfo.Display, WindowInfo.Surface, WindowInfo.Surface, HandleAsEGLContext))
{ {
throw new GraphicsContextException(string.Format("Failed to make context {0} current. Error: {1}", this, Egl.GetError())); throw new GraphicsContextException(string.Format("Failed to make context {0} current. Error: {1}", Handle, Egl.GetError()));
} }
} }
else else