mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-24 18:15:38 +00:00
Avoid using the global namespace in the MINIMAL configuration, as it confuses the Mono compiler.
This commit is contained in:
parent
7bcbfc7072
commit
e8590dddd4
|
@ -2175,10 +2175,13 @@ namespace OpenTK
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Graphics
|
// Need a different namespace to avoid clash with OpenTK.Graphics.
|
||||||
|
namespace OpenTK.Minimal
|
||||||
sealed class Graphics : IDisposable
|
|
||||||
{
|
{
|
||||||
|
#region Graphics
|
||||||
|
|
||||||
|
sealed class Graphics : IDisposable
|
||||||
|
{
|
||||||
public static Graphics FromImage(OpenTK.Image img)
|
public static Graphics FromImage(OpenTK.Image img)
|
||||||
{
|
{
|
||||||
return new Graphics();
|
return new Graphics();
|
||||||
|
@ -2190,8 +2193,10 @@ sealed class Graphics : IDisposable
|
||||||
internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4)
|
internal void DrawImage(OpenTK.Bitmap bitmap, int p, int p_2, int p_3, int p_4)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -755,7 +755,7 @@ namespace OpenTK.Platform.MacOS
|
||||||
|
|
||||||
bitmap = new Bitmap(128, 128);
|
bitmap = new Bitmap(128, 128);
|
||||||
#if MINIMAL
|
#if MINIMAL
|
||||||
using (global::Graphics g = global::Graphics.FromImage(bitmap))
|
using (OpenTK.Minimal.Graphics g = OpenTK.Minimal.Graphics.FromImage(bitmap))
|
||||||
#else
|
#else
|
||||||
using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
|
using (System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap))
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue