zune/Xune
0
0
Fork 0
mirror of https://github.com/ZuneDev/Xune.git synced 2026-07-27 13:13:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added instance of IrisEngineInfo to RenderObject

Browse Source
This commit is contained in:
Yoshi Askharoun
2021-10-01 21:31:34 -05:00
parent 094a1d2efd
commit 890990b37a
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX.RenderApi.Skia/Microsoft/Iris/Render/Common/RenderObject.cs
+3
View File
@@ -12,6 +12,7 @@ namespace Microsoft.Iris.Render.Common
internal abstract class RenderObject : IRenderObject, IDisposable internal abstract class RenderObject : IRenderObject, IDisposable
{ {
private bool m_fObjectDisposed; private bool m_fObjectDisposed;
private IrisEngineInfo m_engineInfo;
internal RenderObject() => this.m_fObjectDisposed = false; internal RenderObject() => this.m_fObjectDisposed = false;
@@ -40,6 +41,8 @@ namespace Microsoft.Iris.Render.Common
} }
} }
internal IrisEngineInfo EngineInfo => m_engineInfo;
[Conditional("DEBUG")] [Conditional("DEBUG")]
protected virtual void Invariant() => Debug2.Validate(!this.m_fObjectDisposed, typeof(ObjectDisposedException), this.GetType().ToString()); protected virtual void Invariant() => Debug2.Validate(!this.m_fObjectDisposed, typeof(ObjectDisposedException), this.GetType().ToString());
} }
UIX.RenderApi.Skia/Microsoft/Iris/Render/Internal/RenderEngine.cs
-1
View File
@@ -12,7 +12,6 @@ namespace Microsoft.Iris.Render.Internal
private static BitArray s_contexts; private static BitArray s_contexts;
private static uint s_contextIdSeed = 1; private static uint s_contextIdSeed = 1;
private static uint s_maxContextId = 254; private static uint s_maxContextId = 254;
private IrisEngineInfo m_engineInfo;
private RenderToken m_primaryToken; private RenderToken m_primaryToken;
private MessagingSession m_messagingSession; private MessagingSession m_messagingSession;
private RenderSession m_renderSession; private RenderSession m_renderSession;
UIX.RenderApi.Skia/Microsoft/Iris/Render/Protocols/Splash/Rendering/RemoteAnimationManager.cs
+9 -9
View File
@@ -49,14 +49,14 @@ namespace Microsoft.Iris.Render.Protocols.Splash.Rendering
Debug2.Throw(this.IsValid, "Non-static method call requires an instance"); Debug2.Throw(this.IsValid, "Non-static method call requires an instance");
_priv_portUse = this.m_renderPort; _priv_portUse = this.m_renderPort;
_priv_portUse.ValidateHandle(this.m_renderHandle); _priv_portUse.ValidateHandle(this.m_renderHandle);
uint size = (uint)sizeof(RemoteAnimationManager.Msg0_SetAnimationRate); uint size = (uint)sizeof(Msg0_SetAnimationRate);
RemoteAnimationManager.Msg0_SetAnimationRate* setAnimationRatePtr = (RemoteAnimationManager.Msg0_SetAnimationRate*)_priv_portUse.AllocMessageBuffer(size); Msg0_SetAnimationRate* setAnimationRatePtr = (Msg0_SetAnimationRate*)_priv_portUse.AllocMessageBuffer(size);
setAnimationRatePtr->_priv_size = size; setAnimationRatePtr->_priv_size = size;
setAnimationRatePtr->_priv_msgid = 0U; setAnimationRatePtr->_priv_msgid = 0U;
setAnimationRatePtr->nFramesPerSecond = nFramesPerSecond; setAnimationRatePtr->nFramesPerSecond = nFramesPerSecond;
setAnimationRatePtr->_priv_idObjectSubject = this.m_renderHandle; setAnimationRatePtr->_priv_idObjectSubject = this.m_renderHandle;
if (_priv_portUse.ForeignByteOrder) if (_priv_portUse.ForeignByteOrder)
MarshalHelper.SwapByteOrder((byte*)setAnimationRatePtr, ref s_priv_ByteOrder_Msg0_SetAnimationRate, typeof(RemoteAnimationManager.Msg0_SetAnimationRate), 0, 0); MarshalHelper.SwapByteOrder((byte*)setAnimationRatePtr, ref s_priv_ByteOrder_Msg0_SetAnimationRate, typeof(Msg0_SetAnimationRate), 0, 0);
_priv_pmsgUse = (Message*)setAnimationRatePtr; _priv_pmsgUse = (Message*)setAnimationRatePtr;
} }
@@ -76,14 +76,14 @@ namespace Microsoft.Iris.Render.Protocols.Splash.Rendering
Debug2.Throw(this.IsValid, "Non-static method call requires an instance"); Debug2.Throw(this.IsValid, "Non-static method call requires an instance");
_priv_portUse = this.m_renderPort; _priv_portUse = this.m_renderPort;
_priv_portUse.ValidateHandle(this.m_renderHandle); _priv_portUse.ValidateHandle(this.m_renderHandle);
uint size = (uint)sizeof(RemoteAnimationManager.Msg1_PulseTimeAdvance); uint size = (uint)sizeof(Msg1_PulseTimeAdvance);
RemoteAnimationManager.Msg1_PulseTimeAdvance* pulseTimeAdvancePtr = (RemoteAnimationManager.Msg1_PulseTimeAdvance*)_priv_portUse.AllocMessageBuffer(size); Msg1_PulseTimeAdvance* pulseTimeAdvancePtr = (Msg1_PulseTimeAdvance*)_priv_portUse.AllocMessageBuffer(size);
pulseTimeAdvancePtr->_priv_size = size; pulseTimeAdvancePtr->_priv_size = size;
pulseTimeAdvancePtr->_priv_msgid = 1U; pulseTimeAdvancePtr->_priv_msgid = 1U;
pulseTimeAdvancePtr->nPulseMs = nPulseMs; pulseTimeAdvancePtr->nPulseMs = nPulseMs;
pulseTimeAdvancePtr->_priv_idObjectSubject = this.m_renderHandle; pulseTimeAdvancePtr->_priv_idObjectSubject = this.m_renderHandle;
if (_priv_portUse.ForeignByteOrder) if (_priv_portUse.ForeignByteOrder)
MarshalHelper.SwapByteOrder((byte*)pulseTimeAdvancePtr, ref s_priv_ByteOrder_Msg1_PulseTimeAdvance, typeof(RemoteAnimationManager.Msg1_PulseTimeAdvance), 0, 0); MarshalHelper.SwapByteOrder((byte*)pulseTimeAdvancePtr, ref s_priv_ByteOrder_Msg1_PulseTimeAdvance, typeof(Msg1_PulseTimeAdvance), 0, 0);
_priv_pmsgUse = (Message*)pulseTimeAdvancePtr; _priv_pmsgUse = (Message*)pulseTimeAdvancePtr;
} }
@@ -103,14 +103,14 @@ namespace Microsoft.Iris.Render.Protocols.Splash.Rendering
Debug2.Throw(this.IsValid, "Non-static method call requires an instance"); Debug2.Throw(this.IsValid, "Non-static method call requires an instance");
_priv_portUse = this.m_renderPort; _priv_portUse = this.m_renderPort;
_priv_portUse.ValidateHandle(this.m_renderHandle); _priv_portUse.ValidateHandle(this.m_renderHandle);
uint size = (uint)sizeof(RemoteAnimationManager.Msg2_SetGlobalSpeedAdjustment); uint size = (uint)sizeof(Msg2_SetGlobalSpeedAdjustment);
RemoteAnimationManager.Msg2_SetGlobalSpeedAdjustment* globalSpeedAdjustmentPtr = (RemoteAnimationManager.Msg2_SetGlobalSpeedAdjustment*)_priv_portUse.AllocMessageBuffer(size); Msg2_SetGlobalSpeedAdjustment* globalSpeedAdjustmentPtr = (Msg2_SetGlobalSpeedAdjustment*)_priv_portUse.AllocMessageBuffer(size);
globalSpeedAdjustmentPtr->_priv_size = size; globalSpeedAdjustmentPtr->_priv_size = size;
globalSpeedAdjustmentPtr->_priv_msgid = 2U; globalSpeedAdjustmentPtr->_priv_msgid = 2U;
globalSpeedAdjustmentPtr->flFactor = flFactor; globalSpeedAdjustmentPtr->flFactor = flFactor;
globalSpeedAdjustmentPtr->_priv_idObjectSubject = this.m_renderHandle; globalSpeedAdjustmentPtr->_priv_idObjectSubject = this.m_renderHandle;
if (_priv_portUse.ForeignByteOrder) if (_priv_portUse.ForeignByteOrder)
MarshalHelper.SwapByteOrder((byte*)globalSpeedAdjustmentPtr, ref s_priv_ByteOrder_Msg2_SetGlobalSpeedAdjustment, typeof(RemoteAnimationManager.Msg2_SetGlobalSpeedAdjustment), 0, 0); MarshalHelper.SwapByteOrder((byte*)globalSpeedAdjustmentPtr, ref s_priv_ByteOrder_Msg2_SetGlobalSpeedAdjustment, typeof(Msg2_SetGlobalSpeedAdjustment), 0, 0);
_priv_pmsgUse = (Message*)globalSpeedAdjustmentPtr; _priv_pmsgUse = (Message*)globalSpeedAdjustmentPtr;
} }
UIX.Skia/Microsoft/Iris/Session/UISession.cs
+9 -9
View File
@@ -302,14 +302,14 @@ namespace Microsoft.Iris.Session
internal void FireOnUnhandledException(object sender, Exception e) internal void FireOnUnhandledException(object sender, Exception e)
{ {
UISession.UnhandledExceptionHandler unhandledException = OnUnhandledException; UnhandledExceptionHandler unhandledException = OnUnhandledException;
if (unhandledException == null) if (unhandledException == null)
return; return;
UISession.UnhandledExceptionArgs args = new UISession.UnhandledExceptionArgs(e); UnhandledExceptionArgs args = new UnhandledExceptionArgs(e);
unhandledException(sender, args); unhandledException(sender, args);
} }
public event UISession.UnhandledExceptionHandler OnUnhandledException; public event UnhandledExceptionHandler OnUnhandledException;
public Form Form => _form; public Form Form => _form;
@@ -319,7 +319,7 @@ namespace Microsoft.Iris.Session
public void PlaySound(string stSoundSource) public void PlaySound(string stSoundSource)
{ {
UISession.PlaySoundArgs playSoundArgs = new UISession.PlaySoundArgs(this, stSoundSource); PlaySoundArgs playSoundArgs = new PlaySoundArgs(this, stSoundSource);
if (!UIDispatcher.IsUIThread) if (!UIDispatcher.IsUIThread)
DeferredCall.Post(DispatchPriority.High, s_deferredPlaySound, playSoundArgs); DeferredCall.Post(DispatchPriority.High, s_deferredPlaySound, playSoundArgs);
else else
@@ -328,7 +328,7 @@ namespace Microsoft.Iris.Session
private static void DeferredPlaySound(object argsObject) private static void DeferredPlaySound(object argsObject)
{ {
UISession.PlaySoundArgs playSoundArgs = argsObject as UISession.PlaySoundArgs; PlaySoundArgs playSoundArgs = argsObject as PlaySoundArgs;
if (!playSoundArgs.uiSession.IsValid || playSoundArgs.stSoundSource == null) if (!playSoundArgs.uiSession.IsValid || playSoundArgs.stSoundSource == null)
return; return;
new Sound() { Source = playSoundArgs.stSoundSource }.Play(); new Sound() { Source = playSoundArgs.stSoundSource }.Play();
@@ -336,7 +336,7 @@ namespace Microsoft.Iris.Session
public void PlaySystemSound(SystemSoundEvent systemSoundEvent) public void PlaySystemSound(SystemSoundEvent systemSoundEvent)
{ {
UISession.PlaySystemSoundArgs playSystemSoundArgs = new UISession.PlaySystemSoundArgs(this, systemSoundEvent); PlaySystemSoundArgs playSystemSoundArgs = new PlaySystemSoundArgs(this, systemSoundEvent);
if (!UIDispatcher.IsUIThread) if (!UIDispatcher.IsUIThread)
DeferredCall.Post(DispatchPriority.High, s_deferredPlaySystemSound, playSystemSoundArgs); DeferredCall.Post(DispatchPriority.High, s_deferredPlaySystemSound, playSystemSoundArgs);
else else
@@ -345,7 +345,7 @@ namespace Microsoft.Iris.Session
private static void DeferredPlaySystemSound(object argsObject) private static void DeferredPlaySystemSound(object argsObject)
{ {
UISession.PlaySystemSoundArgs playSystemSoundArgs = argsObject as UISession.PlaySystemSoundArgs; PlaySystemSoundArgs playSystemSoundArgs = argsObject as PlaySystemSoundArgs;
if (!playSystemSoundArgs.uiSession.IsValid || playSystemSoundArgs.systemSoundEvent == SystemSoundEvent.None) if (!playSystemSoundArgs.uiSession.IsValid || playSystemSoundArgs.systemSoundEvent == SystemSoundEvent.None)
return; return;
new Sound() new Sound()
@@ -367,12 +367,12 @@ namespace Microsoft.Iris.Session
public delegate void UnhandledExceptionHandler( public delegate void UnhandledExceptionHandler(
object sender, object sender,
UISession.UnhandledExceptionArgs args); UnhandledExceptionArgs args);
private class TaskReentrancyDetection : IDisposable private class TaskReentrancyDetection : IDisposable
{ {
private static string s_currentTask; private static string s_currentTask;
private static UISession.TaskReentrancyDetection s_currentTaskClearer = new UISession.TaskReentrancyDetection(); private static TaskReentrancyDetection s_currentTaskClearer = new TaskReentrancyDetection();
public static IDisposable Enter(string task) public static IDisposable Enter(string task)
{ {