Some fixes for rebase and other tweaks

Ryujinx.Graphics/NvGpu.cs

@@ -1,8 +1,8 @@
 using Ryujinx.Graphics.Gal;
 using Ryujinx.Graphics.Graphics3d;
 using Ryujinx.Graphics.Memory;
-using Ryujinx.Graphics.VideoDecoding;
-using Ryujinx.Graphics.VideoImageComposition;
+using Ryujinx.Graphics.VDec;
+using Ryujinx.Graphics.Vic;
 
 namespace Ryujinx.Graphics
 {

Ryujinx.Graphics/VDec/BitStreamWriter.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class BitStreamWriter
     {

Ryujinx.Graphics/VDec/DecoderHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     static class DecoderHelper
     {

Ryujinx.Graphics/VDec/FFmpeg.cs

@@ -2,7 +2,7 @@ using FFmpeg.AutoGen;
 using System;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     unsafe static class FFmpegWrapper
     {

Ryujinx.Graphics/VDec/FFmpegFrame.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     unsafe struct FFmpegFrame
     {

Ryujinx.Graphics/VDec/H264BitStreamWriter.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class H264BitStreamWriter : BitStreamWriter
     {

Ryujinx.Graphics/VDec/H264Decoder.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class H264Decoder
     {

Ryujinx.Graphics/VDec/H264Matrices.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     struct H264Matrices
     {

Ryujinx.Graphics/VDec/H264ParameterSets.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
     struct H264ParameterSets

Ryujinx.Graphics/VDec/VideoCodec.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     enum VideoCodec
     {

Ryujinx.Graphics/VDec/VideoDecoder.cs

@@ -1,11 +1,11 @@
 using Ryujinx.Graphics.Gal;
 using Ryujinx.Graphics.Memory;
 using Ryujinx.Graphics.Texture;
-using Ryujinx.Graphics.VideoImageComposition;
+using Ryujinx.Graphics.Vic;
 using System;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     unsafe class VideoDecoder
     {
@@ -108,7 +108,7 @@ namespace Ryujinx.Graphics.VideoDecoding
                     Tx32x32Probs          = Vmm.ReadBytes(VpxProbTablesAddress + 0x476, 0x6),
                     CoefProbs             = Vmm.ReadBytes(VpxProbTablesAddress + 0x5a0, 0x900),
                     SkipProbs             = Vmm.ReadBytes(VpxProbTablesAddress + 0x537, 0x3),
-                    InterModeProbs        = Vmm.ReadBytes(VpxProbTablesAddress + 0x400, 0x28),
+                    InterModeProbs        = Vmm.ReadBytes(VpxProbTablesAddress + 0x400, 0x1c),
                     InterpFilterProbs     = Vmm.ReadBytes(VpxProbTablesAddress + 0x52a, 0x8),
                     IsInterProbs          = Vmm.ReadBytes(VpxProbTablesAddress + 0x41c, 0x4),
                     CompModeProbs         = Vmm.ReadBytes(VpxProbTablesAddress + 0x532, 0x5),

Ryujinx.Graphics/VDec/VideoDecoderMeth.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     enum VideoDecoderMeth
     {

Ryujinx.Graphics/VDec/Vp9Decoder.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class Vp9Decoder
     {

Ryujinx.Graphics/VDec/Vp9FrameHeader.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     [StructLayout(LayoutKind.Sequential, Pack = 2)]
     struct Vp9FrameDimensions

Ryujinx.Graphics/VDec/Vp9FrameKeys.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     struct Vp9FrameKeys
     {

Ryujinx.Graphics/VDec/Vp9ProbabilityTables.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     struct Vp9ProbabilityTables
     {

Ryujinx.Graphics/VDec/VpxBitStreamWriter.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class VpxBitStreamWriter : BitStreamWriter
     {

Ryujinx.Graphics/VDec/VpxRangeEncoder.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Graphics.VideoDecoding
+namespace Ryujinx.Graphics.VDec
 {
     class VpxRangeEncoder
     {

Ryujinx.Graphics/Vic/StructUnpacker.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Memory;
 using System;
 
-namespace Ryujinx.Graphics.VideoImageComposition
+namespace Ryujinx.Graphics.Vic
 {
     class StructUnpacker
     {

Ryujinx.Graphics/Vic/SurfaceOutputConfig.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoImageComposition
+namespace Ryujinx.Graphics.Vic
 {
     struct SurfaceOutputConfig
     {

Ryujinx.Graphics/Vic/SurfacePixelFormat.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoImageComposition
+namespace Ryujinx.Graphics.Vic
 {
     enum SurfacePixelFormat
     {

Ryujinx.Graphics/Vic/VideoImageComposer.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.Memory;
 
-namespace Ryujinx.Graphics.VideoImageComposition
+namespace Ryujinx.Graphics.Vic
 {
     class VideoImageComposer
     {

Ryujinx.Graphics/Vic/VideoImageComposerMeth.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Graphics.VideoImageComposition
+namespace Ryujinx.Graphics.Vic
 {
     enum VideoImageComposerMeth
     {

Ryujinx.HLE/HOS/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs

@@ -47,7 +47,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
             long InputPosition  = Context.Request.GetBufferType0x21().Position;
             long OutputPosition = Context.Request.GetBufferType0x22().Position;
 
-            NvHostChannelSubmit Args = AMemoryHelper.Read<NvHostChannelSubmit>(Context.Memory, InputPosition);
+            NvHostChannelSubmit Args = MemoryHelper.Read<NvHostChannelSubmit>(Context.Memory, InputPosition);
 
             NvGpuVmm Vmm = NvGpuASIoctl.GetASCtx(Context).Vmm;
 
@@ -55,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
             {
                 long CmdBufOffset = InputPosition + 0x10 + Index * 0xc;
 
-                NvHostChannelCmdBuf CmdBuf = AMemoryHelper.Read<NvHostChannelCmdBuf>(Context.Memory, CmdBufOffset);
+                NvHostChannelCmdBuf CmdBuf = MemoryHelper.Read<NvHostChannelCmdBuf>(Context.Memory, CmdBufOffset);
 
                 NvMapHandle Map = NvMapIoctl.GetNvMap(Context, CmdBuf.MemoryId);
 
@@ -80,11 +80,11 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
             long InputPosition  = Context.Request.GetBufferType0x21().Position;
             long OutputPosition = Context.Request.GetBufferType0x22().Position;
 
-            NvHostChannelGetParamArg Args = AMemoryHelper.Read<NvHostChannelGetParamArg>(Context.Memory, InputPosition);
+            NvHostChannelGetParamArg Args = MemoryHelper.Read<NvHostChannelGetParamArg>(Context.Memory, InputPosition);
 
             Args.Value = 0;
 
-            AMemoryHelper.Write(Context.Memory, OutputPosition, Args);
+            MemoryHelper.Write(Context.Memory, OutputPosition, Args);
 
             return NvResult.Success;
         }
@@ -94,11 +94,11 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
             long InputPosition  = Context.Request.GetBufferType0x21().Position;
             long OutputPosition = Context.Request.GetBufferType0x22().Position;
 
-            NvHostChannelGetParamArg Args = AMemoryHelper.Read<NvHostChannelGetParamArg>(Context.Memory, InputPosition);
+            NvHostChannelGetParamArg Args = MemoryHelper.Read<NvHostChannelGetParamArg>(Context.Memory, InputPosition);
 
             Args.Value = 0;
 
-            AMemoryHelper.Write(Context.Memory, OutputPosition, Args);
+            MemoryHelper.Write(Context.Memory, OutputPosition, Args);
 
             return NvResult.Success;
         }
@@ -108,7 +108,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
             long InputPosition  = Context.Request.GetBufferType0x21().Position;
             long OutputPosition = Context.Request.GetBufferType0x22().Position;
 
-            NvHostChannelMapBuffer Args = AMemoryHelper.Read<NvHostChannelMapBuffer>(Context.Memory, InputPosition);
+            NvHostChannelMapBuffer Args = MemoryHelper.Read<NvHostChannelMapBuffer>(Context.Memory, InputPosition);
 
             NvGpuVmm Vmm = NvGpuASIoctl.GetASCtx(Context).Vmm;
 
@@ -143,7 +143,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvHostChannel
         {
             long InputPosition  = Context.Request.GetBufferType0x21().Position;
 
-            NvHostChannelMapBuffer Args = AMemoryHelper.Read<NvHostChannelMapBuffer>(Context.Memory, InputPosition);
+            NvHostChannelMapBuffer Args = MemoryHelper.Read<NvHostChannelMapBuffer>(Context.Memory, InputPosition);
 
             NvGpuVmm Vmm = NvGpuASIoctl.GetASCtx(Context).Vmm;