From 8954ff3af20b8b6bb3940c073b24cda1c81703d5 Mon Sep 17 00:00:00 2001 From: Marco Carvalho Date: Sun, 4 Jun 2023 17:30:04 -0300 Subject: [PATCH] Replacing ZbcColorArray with Array4 (#5210) * Related "if/else if" statements should not have the same condition * replacing ZbcColorArray with Array4 * fix alignment --- .../Types/ZbcSetTableArguments.cs | 47 +++---------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/src/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/ZbcSetTableArguments.cs b/src/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/ZbcSetTableArguments.cs index ed74cc2631..a4651f844f 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/ZbcSetTableArguments.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/Types/ZbcSetTableArguments.cs @@ -1,49 +1,16 @@ -using System; +using Ryujinx.Common.Memory; +using System; using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu.Types { - [StructLayout(LayoutKind.Sequential)] - struct ZbcColorArray - { - private uint element0; - private uint element1; - private uint element2; - private uint element3; - - public uint this[int index] - { - get - { - if (index == 0) - { - return element0; - } - else if (index == 1) - { - return element1; - } - else if (index == 2) - { - return element2; - } - else if (index == 2) - { - return element3; - } - - throw new IndexOutOfRangeException(); - } - } - } - [StructLayout(LayoutKind.Sequential)] struct ZbcSetTableArguments { - public ZbcColorArray ColorDs; - public ZbcColorArray ColorL2; - public uint Depth; - public uint Format; - public uint Type; + public Array4 ColorDs; + public Array4 ColorL2; + public uint Depth; + public uint Format; + public uint Type; } }