mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweaks from feedback

Browse source
This commit is contained in:
Alex Barney 2019-03-03 18:51:15 -06:00
commit ea9684ed6a
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mf.cs
View file

@ -69,24 +69,24 @@ namespace Ryujinx.Graphics.Graphics3d
int dstSizeX = ReadRegister(NvGpuEngineM2mfReg.DstSizeX); int dstSizeX = ReadRegister(NvGpuEngineM2mfReg.DstSizeX);
int dstSizeY = ReadRegister(NvGpuEngineM2mfReg.DstSizeY); int dstSizeY = ReadRegister(NvGpuEngineM2mfReg.DstSizeY);
int dstSizeZ = ReadRegister(NvGpuEngineM2mfReg.DstSizeZ); int dstSizeZ = ReadRegister(NvGpuEngineM2mfReg.DstSizeZ);
int dstPosXy = ReadRegister(NvGpuEngineM2mfReg.DstPosXy); int dstPosXY = ReadRegister(NvGpuEngineM2mfReg.DstPosXY);
int dstPosZ = ReadRegister(NvGpuEngineM2mfReg.DstPosZ); int dstPosZ = ReadRegister(NvGpuEngineM2mfReg.DstPosZ);
int srcBlkDim = ReadRegister(NvGpuEngineM2mfReg.SrcBlkDim); int srcBlkDim = ReadRegister(NvGpuEngineM2mfReg.SrcBlkDim);
int srcSizeX = ReadRegister(NvGpuEngineM2mfReg.SrcSizeX); int srcSizeX = ReadRegister(NvGpuEngineM2mfReg.SrcSizeX);
int srcSizeY = ReadRegister(NvGpuEngineM2mfReg.SrcSizeY); int srcSizeY = ReadRegister(NvGpuEngineM2mfReg.SrcSizeY);
int srcSizeZ = ReadRegister(NvGpuEngineM2mfReg.SrcSizeZ); int srcSizeZ = ReadRegister(NvGpuEngineM2mfReg.SrcSizeZ);
int srcPosXy = ReadRegister(NvGpuEngineM2mfReg.SrcPosXy); int srcPosXY = ReadRegister(NvGpuEngineM2mfReg.SrcPosXY);
int srcPosZ = ReadRegister(NvGpuEngineM2mfReg.SrcPosZ); int srcPosZ = ReadRegister(NvGpuEngineM2mfReg.SrcPosZ);
int srcCpp = ((swizzle >> 20) & 7) + 1; int srcCpp = ((swizzle >> 20) & 7) + 1;
int dstCpp = ((swizzle >> 24) & 7) + 1; int dstCpp = ((swizzle >> 24) & 7) + 1;
int dstPosX = (dstPosXy >> 0) & 0xffff; int dstPosX = (dstPosXY >> 0) & 0xffff;
int dstPosY = (dstPosXy >> 16) & 0xffff; int dstPosY = (dstPosXY >> 16) & 0xffff;
int srcPosX = (srcPosXy >> 0) & 0xffff; int srcPosX = (srcPosXY >> 0) & 0xffff;
int srcPosY = (srcPosXy >> 16) & 0xffff; int srcPosY = (srcPosXY >> 16) & 0xffff;
int srcBlockHeight = 1 << ((srcBlkDim >> 4) & 0xf); int srcBlockHeight = 1 << ((srcBlkDim >> 4) & 0xf);
int dstBlockHeight = 1 << ((dstBlkDim >> 4) & 0xf); int dstBlockHeight = 1 << ((dstBlkDim >> 4) & 0xf);

4
Ryujinx.Graphics/Graphics3d/NvGpuEngineM2mfReg.cs
View file

@ -14,12 +14,12 @@ namespace Ryujinx.Graphics.Graphics3d
DstSizeY = 0x1c5, DstSizeY = 0x1c5,
DstSizeZ = 0x1c6, DstSizeZ = 0x1c6,
DstPosZ = 0x1c7, DstPosZ = 0x1c7,
DstPosXy = 0x1c8, DstPosXY = 0x1c8,
SrcBlkDim = 0x1ca, SrcBlkDim = 0x1ca,
SrcSizeX = 0x1cb, SrcSizeX = 0x1cb,
SrcSizeY = 0x1cc, SrcSizeY = 0x1cc,
SrcSizeZ = 0x1cd, SrcSizeZ = 0x1cd,
SrcPosZ = 0x1ce, SrcPosZ = 0x1ce,
SrcPosXy = 0x1cf SrcPosXY = 0x1cf
} }
} }

2
Ryujinx.Graphics/Graphics3d/Texture/IntegerEncoded.cs
View file

@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.Texture
public IntegerEncoded(EIntegerEncoding encoding, int numBits) public IntegerEncoded(EIntegerEncoding encoding, int numBits)
{ {
_encoding = encoding; _encoding = encoding;
NumberBits = numBits; NumberBits = numBits;
BitValue = 0; BitValue = 0;
TritValue = 0; TritValue = 0;

6
Ryujinx.Graphics/Graphics3d/Texture/LinearSwizzle.cs
View file

@ -11,9 +11,9 @@ namespace Ryujinx.Graphics.Texture
public LinearSwizzle(int pitch, int bpp, int width, int height) public LinearSwizzle(int pitch, int bpp, int width, int height)
{ {
_pitch = pitch; _pitch = pitch;
_bpp = bpp; _bpp = bpp;
_sliceSize = width * height * bpp; _sliceSize = width * height * bpp;
} }
public void SetMipLevel(int level) public void SetMipLevel(int level)

2
Ryujinx.Graphics/NvGpu.cs
View file

@ -9,7 +9,7 @@ namespace Ryujinx.Graphics
public class NvGpu public class NvGpu
{ {
public const int MaxViewportSize = 0x3FFF; public const int MaxViewportSize = 0x3FFF;
public IGalRenderer Renderer { get; private set; } public IGalRenderer Renderer { get; private set; }
public GpuResourceManager ResourceManager { get; private set; } public GpuResourceManager ResourceManager { get; private set; }