ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed race condition in GraphicsMode.Default.

Browse source
This commit is contained in:
the_fiddler 2009-11-03 13:16:59 +00:00
parent 92c5cbfaf2
commit 043e0fec2f
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Source/OpenTK/Graphics/GraphicsMode.cs
View file

@ -23,7 +23,7 @@ namespace OpenTK.Graphics
static GraphicsMode defaultMode; static GraphicsMode defaultMode;
static IGraphicsMode implementation; static IGraphicsMode implementation;
static object mode_selection_lock = new object(); static readonly object SyncRoot = new object();
#region --- Constructors --- #region --- Constructors ---
@ -31,7 +31,10 @@ namespace OpenTK.Graphics
static GraphicsMode() static GraphicsMode()
{ {
implementation = Platform.Factory.Default.CreateGraphicsMode(); lock (SyncRoot)
{
implementation = Platform.Factory.Default.CreateGraphicsMode();
}
} }
#endregion #endregion
@ -180,10 +183,7 @@ namespace OpenTK.Graphics
if (index == null) if (index == null)
{ {
GraphicsMode mode; GraphicsMode mode;
lock (mode_selection_lock) mode = implementation.SelectGraphicsMode(ColorFormat, Depth, Stencil, Samples, AccumulatorFormat, Buffers, Stereo);
{
mode = implementation.SelectGraphicsMode(ColorFormat, Depth, Stencil, Samples, AccumulatorFormat, Buffers, Stereo);
}
Index = mode.Index; Index = mode.Index;
ColorFormat = mode.ColorFormat; ColorFormat = mode.ColorFormat;
@ -303,13 +303,16 @@ namespace OpenTK.Graphics
{ {
get get
{ {
if (defaultMode == null) lock (SyncRoot)
{ {
Debug.Print("Creating default GraphicsMode ({0}, {1}, {2}, {3}, {4}, {5}, {6}).", DisplayDevice.Default.BitsPerPixel, if (defaultMode == null)
16, 0, 0, 0, 2, false); {
defaultMode = new GraphicsMode(DisplayDevice.Default.BitsPerPixel, 16, 0, 0, 0, 2, false); Debug.Print("Creating default GraphicsMode ({0}, {1}, {2}, {3}, {4}, {5}, {6}).", DisplayDevice.Default.BitsPerPixel,
16, 0, 0, 0, 2, false);
defaultMode = new GraphicsMode(DisplayDevice.Default.BitsPerPixel, 16, 0, 0, 0, 2, false);
}
return defaultMode;
} }
return defaultMode;
} }
} }