SmokeyMcGames/JinxRyu
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Replace glFinish with barrier for WaitForIdle (#878)

Browse source
This commit is contained in:
gdkchan 2020-01-12 19:12:40 -03:00 committed by jduncanator
parent 88f78ae6c8
commit 2bb39ff03e
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.GAL/IPipeline.cs
View file

@ -4,6 +4,8 @@ namespace Ryujinx.Graphics.GAL
{ {
public interface IPipeline public interface IPipeline
{ {
void Barrier();
void ClearRenderTargetColor(int index, uint componentMask, ColorF color); void ClearRenderTargetColor(int index, uint componentMask, ColorF color);
void ClearRenderTargetDepthStencil( void ClearRenderTargetDepthStencil(

2
Ryujinx.Graphics.GAL/IRenderer.cs
View file

@ -18,8 +18,6 @@ namespace Ryujinx.Graphics.GAL
ISampler CreateSampler(SamplerCreateInfo info); ISampler CreateSampler(SamplerCreateInfo info);
ITexture CreateTexture(TextureCreateInfo info); ITexture CreateTexture(TextureCreateInfo info);
void FlushPipelines();
Capabilities GetCapabilities(); Capabilities GetCapabilities();
ulong GetCounter(CounterType type); ulong GetCounter(CounterType type);

2
Ryujinx.Graphics.Gpu/NvGpuFifo.cs
View file

@ -154,7 +154,7 @@ namespace Ryujinx.Graphics.Gpu
{ {
_context.Methods.PerformDeferredDraws(); _context.Methods.PerformDeferredDraws();
_context.Renderer.FlushPipelines(); _context.Renderer.Pipeline.Barrier();
break; break;
} }

5
Ryujinx.Graphics.OpenGL/Pipeline.cs
View file

@ -37,6 +37,11 @@ namespace Ryujinx.Graphics.OpenGL
_clipDepthMode = ClipDepthMode.NegativeOneToOne; _clipDepthMode = ClipDepthMode.NegativeOneToOne;
} }
public void Barrier()
{
GL.MemoryBarrier(MemoryBarrierFlags.AllBarrierBits);
}
public void ClearRenderTargetColor(int index, uint componentMask, ColorF color) public void ClearRenderTargetColor(int index, uint componentMask, ColorF color)
{ {
GL.ColorMask( GL.ColorMask(

5
Ryujinx.Graphics.OpenGL/Renderer.cs
View file

@ -55,11 +55,6 @@ namespace Ryujinx.Graphics.OpenGL
return new TextureStorage(this, info).CreateDefaultView(); return new TextureStorage(this, info).CreateDefaultView();
} }
public void FlushPipelines()
{
GL.Finish();
}
public Capabilities GetCapabilities() public Capabilities GetCapabilities()
{ {
return new Capabilities( return new Capabilities(