From b8eb6abeccbd4a468214a4d2ad3a9b6e5e06973c Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Tue, 5 May 2020 22:02:28 -0300
Subject: Refactor shader GPU state and memory access (#1203)

* Refactor shader GPU state and memory access

* Fix NVDEC project build

* Address PR feedback and add missing XML comments
---
 Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs')

diff --git a/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs b/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs
index b4a89d8f..9afc9485 100644
--- a/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs
+++ b/Ryujinx.Graphics.Nvdec/VDec/VideoDecoder.cs
@@ -1,6 +1,8 @@
 using Ryujinx.Graphics.Gpu;
+using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Vic;
 using System;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.VDec
 {
@@ -70,7 +72,7 @@ namespace Ryujinx.Graphics.VDec
                     ScalingMatrix8 = gpu.MemoryAccessor.ReadBytes(_decoderContextAddress + 0x220, 2 * 64)
                 };
 
-                byte[] frameData = gpu.MemoryAccessor.ReadBytes(_frameDataAddress, (ulong)frameDataSize);
+                byte[] frameData = gpu.MemoryAccessor.ReadBytes(_frameDataAddress, frameDataSize);
 
                 _h264Decoder.Decode(Params, matrices, frameData);
             }
@@ -86,7 +88,7 @@ namespace Ryujinx.Graphics.VDec
                     Ref2Key = (long)gpu.MemoryManager.Translate(_vpxRef2LumaAddress)
                 };
 
-                Vp9FrameHeader header = gpu.MemoryAccessor.Read<Vp9FrameHeader>(_decoderContextAddress + 0x48);
+                Vp9FrameHeader header = ReadStruct<Vp9FrameHeader>(gpu.MemoryAccessor, _decoderContextAddress + 0x48);
 
                 Vp9ProbabilityTables probs = new Vp9ProbabilityTables()
                 {
@@ -117,7 +119,7 @@ namespace Ryujinx.Graphics.VDec
                     MvHpProbs             = gpu.MemoryAccessor.ReadBytes(_vpxProbTablesAddress + 0x54a, 0x2)
                 };
 
-                byte[] frameData = gpu.MemoryAccessor.ReadBytes(_frameDataAddress, (ulong)frameDataSize);
+                byte[] frameData = gpu.MemoryAccessor.ReadBytes(_frameDataAddress, frameDataSize);
 
                 _vp9Decoder.Decode(keys, header, probs, frameData);
             }
@@ -127,6 +129,19 @@ namespace Ryujinx.Graphics.VDec
             }
         }
 
+        private T ReadStruct<T>(MemoryAccessor accessor, ulong address) where T : struct
+        {
+            byte[] data = accessor.ReadBytes(address, Marshal.SizeOf<T>());
+
+            unsafe
+            {
+                fixed (byte* ptr = data)
+                {
+                    return Marshal.PtrToStructure<T>((IntPtr)ptr);
+                }
+            }
+        }
+
         private void SetDecoderCtxAddr(int[] arguments)
         {
             _decoderContextAddress = GetAddress(arguments);
-- 
cgit v1.2.3