N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement DepthWriteMask and add R16G16 (#425)

Browse source
This commit is contained in:
ReinUsesLisp 2018-09-19 22:02:11 -03:00 committed by gdkchan
parent bed13f2022
commit 47a62e826f
6 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Ryujinx.Graphics/Gal/GalPipelineState.cs
View file

@ -34,6 +34,7 @@
public GalCullFace CullFace; public GalCullFace CullFace;
public bool DepthTestEnabled; public bool DepthTestEnabled;
public bool DepthWriteEnabled;
public GalComparisonOp DepthFunc; public GalComparisonOp DepthFunc;
public bool StencilTestEnabled; public bool StencilTestEnabled;

14
Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs
View file

@ -85,6 +85,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
CullFace = GalCullFace.Back, CullFace = GalCullFace.Back,
DepthTestEnabled = false, DepthTestEnabled = false,
DepthWriteEnabled = true,
DepthFunc = GalComparisonOp.Less, DepthFunc = GalComparisonOp.Less,
StencilTestEnabled = false, StencilTestEnabled = false,
@ -138,19 +139,19 @@ namespace Ryujinx.Graphics.Gal.OpenGL
//Note: Uncomment SetFrontFace and SetCullFace when flipping issues are solved //Note: Uncomment SetFrontFace and SetCullFace when flipping issues are solved
//if (New.FrontFace != O.FrontFace) //if (New.FrontFace != Old.FrontFace)
//{ //{
// GL.FrontFace(OGLEnumConverter.GetFrontFace(New.FrontFace)); // GL.FrontFace(OGLEnumConverter.GetFrontFace(New.FrontFace));
//} //}
//if (New.CullFaceEnabled != O.CullFaceEnabled) //if (New.CullFaceEnabled != Old.CullFaceEnabled)
//{ //{
// Enable(EnableCap.CullFace, New.CullFaceEnabled); // Enable(EnableCap.CullFace, New.CullFaceEnabled);
//} //}
//if (New.CullFaceEnabled) //if (New.CullFaceEnabled)
//{ //{
// if (New.CullFace != O.CullFace) // if (New.CullFace != Old.CullFace)
// { // {
// GL.CullFace(OGLEnumConverter.GetCullFace(New.CullFace)); // GL.CullFace(OGLEnumConverter.GetCullFace(New.CullFace));
// } // }
@ -161,6 +162,13 @@ namespace Ryujinx.Graphics.Gal.OpenGL
Enable(EnableCap.DepthTest, New.DepthTestEnabled); Enable(EnableCap.DepthTest, New.DepthTestEnabled);
} }
if (New.DepthWriteEnabled != Old.DepthWriteEnabled)
{
Rasterizer.DepthWriteEnabled = New.DepthWriteEnabled;
GL.DepthMask(New.DepthWriteEnabled);
}
if (New.DepthTestEnabled) if (New.DepthTestEnabled)
{ {
if (New.DepthFunc != Old.DepthFunc) if (New.DepthFunc != Old.DepthFunc)

15
Ryujinx.Graphics/Gal/OpenGL/OGLRasterizer.cs
View file

@ -5,6 +5,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
class OGLRasterizer : IGalRasterizer class OGLRasterizer : IGalRasterizer
{ {
public bool DepthWriteEnabled { set; private get; }
private int[] VertexBuffers; private int[] VertexBuffers;
private OGLCachedResource<int> VboCache; private OGLCachedResource<int> VboCache;
@ -28,6 +30,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
IboCache = new OGLCachedResource<int>(GL.DeleteBuffer); IboCache = new OGLCachedResource<int>(GL.DeleteBuffer);
IndexBuffer = new IbInfo(); IndexBuffer = new IbInfo();
DepthWriteEnabled = true;
} }
public void LockCaches() public void LockCaches()
@ -49,6 +53,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL
float Depth, float Depth,
int Stencil) int Stencil)
{ {
//OpenGL needs glDepthMask to be enabled to clear it
if (!DepthWriteEnabled)
{
GL.DepthMask(true);
}
GL.ColorMask( GL.ColorMask(
Flags.HasFlag(GalClearBufferFlags.ColorRed), Flags.HasFlag(GalClearBufferFlags.ColorRed),
Flags.HasFlag(GalClearBufferFlags.ColorGreen), Flags.HasFlag(GalClearBufferFlags.ColorGreen),
@ -68,6 +78,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
} }
GL.ColorMask(true, true, true, true); GL.ColorMask(true, true, true, true);
if (!DepthWriteEnabled)
{
GL.DepthMask(false);
}
} }
public bool IsVboCached(long Key, long DataSize) public bool IsVboCached(long Key, long DataSize)

27
Ryujinx.Graphics/NvGpuEngine3d.cs
View file

@ -209,7 +209,7 @@ namespace Ryujinx.Graphics
private void SetFrameBuffer(GalPipelineState State) private void SetFrameBuffer(GalPipelineState State)
{ {
State.FramebufferSrgb = (ReadRegister(NvGpuEngine3dReg.FrameBufferSrgb) & 1) != 0; State.FramebufferSrgb = ReadRegisterBool(NvGpuEngine3dReg.FrameBufferSrgb);
State.FlipX = GetFlipSign(NvGpuEngine3dReg.ViewportNScaleX); State.FlipX = GetFlipSign(NvGpuEngine3dReg.ViewportNScaleX);
State.FlipY = GetFlipSign(NvGpuEngine3dReg.ViewportNScaleY); State.FlipY = GetFlipSign(NvGpuEngine3dReg.ViewportNScaleY);
@ -227,7 +227,7 @@ namespace Ryujinx.Graphics
GalMemoryLayout Layout = (GalMemoryLayout)((BlockDim >> 12) & 1); //? GalMemoryLayout Layout = (GalMemoryLayout)((BlockDim >> 12) & 1); //?
bool ZetaEnable = (ReadRegister(NvGpuEngine3dReg.ZetaEnable) & 1) != 0; bool ZetaEnable = ReadRegisterBool(NvGpuEngine3dReg.ZetaEnable);
if (VA == 0 || ZetaFormat == 0 || !ZetaEnable) if (VA == 0 || ZetaFormat == 0 || !ZetaEnable)
{ {
@ -352,7 +352,7 @@ namespace Ryujinx.Graphics
private void SetCullFace(GalPipelineState State) private void SetCullFace(GalPipelineState State)
{ {
State.CullFaceEnabled = (ReadRegister(NvGpuEngine3dReg.CullFaceEnable) & 1) != 0; State.CullFaceEnabled = ReadRegisterBool(NvGpuEngine3dReg.CullFaceEnable);
if (State.CullFaceEnabled) if (State.CullFaceEnabled)
{ {
@ -362,7 +362,9 @@ namespace Ryujinx.Graphics
private void SetDepth(GalPipelineState State) private void SetDepth(GalPipelineState State)
{ {
State.DepthTestEnabled = (ReadRegister(NvGpuEngine3dReg.DepthTestEnable) & 1) != 0; State.DepthTestEnabled = ReadRegisterBool(NvGpuEngine3dReg.DepthTestEnable);
State.DepthWriteEnabled = ReadRegisterBool(NvGpuEngine3dReg.DepthWriteEnable);
if (State.DepthTestEnabled) if (State.DepthTestEnabled)
{ {
@ -372,7 +374,7 @@ namespace Ryujinx.Graphics
private void SetStencil(GalPipelineState State) private void SetStencil(GalPipelineState State)
{ {
State.StencilTestEnabled = (ReadRegister(NvGpuEngine3dReg.StencilEnable) & 1) != 0; State.StencilTestEnabled = ReadRegisterBool(NvGpuEngine3dReg.StencilEnable);
if (State.StencilTestEnabled) if (State.StencilTestEnabled)
{ {
@ -397,11 +399,11 @@ namespace Ryujinx.Graphics
private void SetAlphaBlending(GalPipelineState State) private void SetAlphaBlending(GalPipelineState State)
{ {
//TODO: Support independent blend properly. //TODO: Support independent blend properly.
State.BlendEnabled = (ReadRegister(NvGpuEngine3dReg.IBlendNEnable) & 1) != 0; State.BlendEnabled = ReadRegisterBool(NvGpuEngine3dReg.IBlendNEnable);
if (State.BlendEnabled) if (State.BlendEnabled)
{ {
State.BlendSeparateAlpha = (ReadRegister(NvGpuEngine3dReg.IBlendNSeparateAlpha) & 1) != 0; State.BlendSeparateAlpha = ReadRegisterBool(NvGpuEngine3dReg.IBlendNSeparateAlpha);
State.BlendEquationRgb = (GalBlendEquation)ReadRegister(NvGpuEngine3dReg.IBlendNEquationRgb); State.BlendEquationRgb = (GalBlendEquation)ReadRegister(NvGpuEngine3dReg.IBlendNEquationRgb);
State.BlendFuncSrcRgb = (GalBlendFactor)ReadRegister(NvGpuEngine3dReg.IBlendNFuncSrcRgb); State.BlendFuncSrcRgb = (GalBlendFactor)ReadRegister(NvGpuEngine3dReg.IBlendNFuncSrcRgb);
@ -414,7 +416,7 @@ namespace Ryujinx.Graphics
private void SetPrimitiveRestart(GalPipelineState State) private void SetPrimitiveRestart(GalPipelineState State)
{ {
State.PrimitiveRestartEnabled = (ReadRegister(NvGpuEngine3dReg.PrimRestartEnable) & 1) != 0; State.PrimitiveRestartEnabled = ReadRegisterBool(NvGpuEngine3dReg.PrimRestartEnable);
if (State.PrimitiveRestartEnabled) if (State.PrimitiveRestartEnabled)
{ {
@ -424,7 +426,7 @@ namespace Ryujinx.Graphics
private void SetRenderTargets() private void SetRenderTargets()
{ {
bool SeparateFragData = (ReadRegister(NvGpuEngine3dReg.RTSeparateFragData) & 1) != 0; bool SeparateFragData = ReadRegisterBool(NvGpuEngine3dReg.RTSeparateFragData);
if (SeparateFragData) if (SeparateFragData)
{ {
@ -635,7 +637,7 @@ namespace Ryujinx.Graphics
int VertexDivisor = ReadRegister(NvGpuEngine3dReg.VertexArrayNDivisor + Index * 4); int VertexDivisor = ReadRegister(NvGpuEngine3dReg.VertexArrayNDivisor + Index * 4);
bool Instanced = (ReadRegister(NvGpuEngine3dReg.VertexArrayNInstance + Index) & 1) != 0; bool Instanced = ReadRegisterBool(NvGpuEngine3dReg.VertexArrayNInstance + Index);
int Stride = Control & 0xfff; int Stride = Control & 0xfff;
@ -845,6 +847,11 @@ namespace Ryujinx.Graphics
return BitConverter.Int32BitsToSingle(ReadRegister(Reg)); return BitConverter.Int32BitsToSingle(ReadRegister(Reg));
} }
private bool ReadRegisterBool(NvGpuEngine3dReg Reg)
{
return (ReadRegister(Reg) & 1) != 0;
}
private void WriteRegister(NvGpuEngine3dReg Reg, int Value) private void WriteRegister(NvGpuEngine3dReg Reg, int Value)
{ {
Registers[(int)Reg] = Value; Registers[(int)Reg] = Value;

1
Ryujinx.Graphics/NvGpuEngine3dReg.cs
View file

@ -35,6 +35,7 @@ namespace Ryujinx.Graphics
ZetaArrayMode = 0x48c, ZetaArrayMode = 0x48c,
DepthTestEnable = 0x4b3, DepthTestEnable = 0x4b3,
IBlendEnable = 0x4b9, IBlendEnable = 0x4b9,
DepthWriteEnable = 0x4ba,
DepthTestFunction = 0x4c3, DepthTestFunction = 0x4c3,
BlendSeparateAlpha = 0x4cf, BlendSeparateAlpha = 0x4cf,
BlendEquationRgb = 0x4d0, BlendEquationRgb = 0x4d0,

2
Ryujinx.Graphics/Texture/ImageUtils.cs
View file

@ -52,7 +52,7 @@ namespace Ryujinx.Graphics.Texture
{ GalTextureFormat.G8R8, GalImageFormat.G8R8 | Snorm | Unorm | Sint | Uint }, { GalTextureFormat.G8R8, GalImageFormat.G8R8 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.R16, GalImageFormat.R16 | Snorm | Unorm | Sint | Uint | Sfloat }, { GalTextureFormat.R16, GalImageFormat.R16 | Snorm | Unorm | Sint | Uint | Sfloat },
{ GalTextureFormat.R8, GalImageFormat.R8 | Snorm | Unorm | Sint | Uint }, { GalTextureFormat.R8, GalImageFormat.R8 | Snorm | Unorm | Sint | Uint },
{ GalTextureFormat.R16G16, GalImageFormat.R16G16 | Snorm }, { GalTextureFormat.R16G16, GalImageFormat.R16G16 | Snorm | Sfloat },
{ GalTextureFormat.R32, GalImageFormat.R32 | Sint | Uint | Sfloat }, { GalTextureFormat.R32, GalImageFormat.R32 | Sint | Uint | Sfloat },
{ GalTextureFormat.A4B4G4R4, GalImageFormat.A4B4G4R4 | Unorm }, { GalTextureFormat.A4B4G4R4, GalImageFormat.A4B4G4R4 | Unorm },
{ GalTextureFormat.A1B5G5R5, GalImageFormat.A1R5G5B5 | Unorm }, { GalTextureFormat.A1B5G5R5, GalImageFormat.A1R5G5B5 | Unorm },