Просмотр исходного кода

Replacing ZbcColorArray with Array4<uint> (#5210)

* Related "if/else if" statements should not have the same condition

* replacing ZbcColorArray with Array4<uint>

* fix alignment
Marco Carvalho 2 лет назад
Родитель
Сommit
8954ff3af2

+ 7 - 40
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<uint> ColorDs;
+        public Array4<uint> ColorL2;
+        public uint Depth;
+        public uint Format;
+        public uint Type;
     }
 }