From 88593bf8727e0da05a8f319951dce19f27e287d6 Mon Sep 17 00:00:00 2001 From: Thomas Guillemard Date: Fri, 8 Nov 2019 15:49:28 +0100 Subject: Add detail of ZbcSetTableArguments (#810) * Add detail of ZbcSetTableArguments This is a missing part of the #800 PR that cause an assert to be triggered in debug mode. Also, remove Fence in SurfaceFlinger as it's a duplicate of NvFence. * Fix critical issue in size checking of ioctl oops --- Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs | 11 ----------- Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs | 11 ++++++----- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs (limited to 'Ryujinx.HLE/HOS/Services/SurfaceFlinger') diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs deleted file mode 100644 index 356a1232..00000000 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger -{ - [StructLayout(LayoutKind.Sequential, Size = 0x8)] - struct Fence - { - public int Id; - public int Value; - } -} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs index 97ad3e20..20e0723b 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs @@ -1,4 +1,5 @@ -using System.Runtime.InteropServices; +using Ryujinx.HLE.HOS.Services.Nv.Types; +using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger { @@ -9,15 +10,15 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger public int FenceCount; [FieldOffset(0x4)] - public Fence Fence0; + public NvFence Fence0; [FieldOffset(0xC)] - public Fence Fence1; + public NvFence Fence1; [FieldOffset(0x14)] - public Fence Fence2; + public NvFence Fence2; [FieldOffset(0x1C)] - public Fence Fence3; + public NvFence Fence3; } } \ No newline at end of file -- cgit v1.2.3