epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressed review comments

Browse Source 
- Renamed `IVideo.CurrentFrameNumber` to `CurrentFrameIndex`
 - Improved logged error message in VideoPlayerWidget
 - Renumbered fields in ThreadedGraphicsContext
This commit is contained in:
penev92
2022-01-09 22:54:54 +02:00
committed by Matthias Mailänder
parent 248b8d1102
commit 860ec642b8
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Platforms.Default/ThreadedGraphicsContext.cs
View File

@@ -557,10 +557,10 @@ namespace OpenRA.Platforms.Default
readonly Func<object> getSize;
readonly Action<object> setEmpty;
readonly Func<byte[]> getData;
readonly Action<object> setData2;
readonly Func<object, object> setData3;
readonly Action<object> setData4;
readonly Func<object, object> setData5;
readonly Action<object> setData1;
readonly Func<object, object> setData2;
readonly Action<object> setData3;
readonly Func<object, object> setData4;
readonly Action dispose;
public ThreadedTexture(ThreadedGraphicsContext device, ITextureInternal texture)
@@ -572,10 +572,10 @@ namespace OpenRA.Platforms.Default
getSize = () => texture.Size;
setEmpty = tuple => { var t = (ValueTuple<int, int>)tuple; texture.SetEmpty(t.Item1, t.Item2); };
getData = () => texture.GetData();
setData2 = tuple => { var t = (ValueTuple<byte[], int, int>)tuple; texture.SetData(t.Item1, t.Item2, t.Item3); };
setData3 = tuple => { setData2(tuple); return null; };
setData4 = tuple => { var t = (ValueTuple<float[], int, int>)tuple; texture.SetFloatData(t.Item1, t.Item2, t.Item3); };
setData5 = tuple => { setData4(tuple); return null; };
setData1 = tuple => { var t = (ValueTuple<byte[], int, int>)tuple; texture.SetData(t.Item1, t.Item2, t.Item3); };
setData2 = tuple => { setData1(tuple); return null; };
setData3 = tuple => { var t = (ValueTuple<float[], int, int>)tuple; texture.SetFloatData(t.Item1, t.Item2, t.Item3); };
setData4 = tuple => { setData3(tuple); return null; };
dispose = texture.Dispose;
}
@@ -609,13 +609,13 @@ namespace OpenRA.Platforms.Default
// If we are able to create a small array the GC can collect easily, post a message to avoid blocking.
var temp = new byte[colors.Length];
Array.Copy(colors, temp, temp.Length);
device.Post(setData2, (temp, width, height));
device.Post(setData1, (temp, width, height));
}
else
{
// If the length is large and would result in an array on the Large Object Heap (LOH),
// send a message and block to avoid LOH allocation as this requires a Gen2 collection.
device.Send(setData3, (colors, width, height));
device.Send(setData2, (colors, width, height));
}
}
@@ -628,13 +628,13 @@ namespace OpenRA.Platforms.Default
// If we are able to create a small array the GC can collect easily, post a message to avoid blocking.
var temp = new float[data.Length];
Array.Copy(data, temp, temp.Length);
device.Post(setData4, (temp, width, height));
device.Post(setData3, (temp, width, height));
}
else
{
// If the length is large and would result in an array on the Large Object Heap (LOH),
// send a message and block to avoid LOH allocation as this requires a Gen2 collection.
device.Send(setData5, (data, width, height));
device.Send(setData4, (data, width, height));
}
}