daniel/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2025-06-28 13:50:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Stop using glTransformFeedbackVaryings and use explicit layout on the shader (#3012)

Browse Source 
* Stop using glTransformFeedbackVarying and use explicit layout on the shader

* This is no longer needed

* Shader cache version bump

* Fix gl_PerVertex output for tessellation control shaders
This commit is contained in:
gdkchan
2022-01-21 12:35:21 -03:00
committed by GitHub
parent 0e59573f2b
commit 7e967d796c
19 changed files with 192 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.GAL
BufferHandle CreateBuffer(int size);
IProgram CreateProgram(IShader[] shaders, TransformFeedbackDescriptor[] transformFeedbackDescriptors);
IProgram CreateProgram(IShader[] shaders);
ISampler CreateSampler(SamplerCreateInfo info);
ITexture CreateTexture(TextureCreateInfo info, float scale);

6
Ryujinx.Graphics.GAL/Multithreading/Resources/Programs/SourceProgramRequest.cs
View File

@ -7,14 +7,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs
public ThreadedProgram Threaded { get; set; }
private IShader[] _shaders;
private TransformFeedbackDescriptor[] _transformFeedbackDescriptors;
public SourceProgramRequest(ThreadedProgram program, IShader[] shaders, TransformFeedbackDescriptor[] transformFeedbackDescriptors)
public SourceProgramRequest(ThreadedProgram program, IShader[] shaders)
{
Threaded = program;
_shaders = shaders;
_transformFeedbackDescriptors = transformFeedbackDescriptors;
}
public IProgram Create(IRenderer renderer)
@ -26,7 +24,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources.Programs
return threaded?.Base;
}).ToArray();
return renderer.CreateProgram(shaders, _transformFeedbackDescriptors);
return renderer.CreateProgram(shaders);
}
}
}

4
Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs
View File

@ -268,10 +268,10 @@ namespace Ryujinx.Graphics.GAL.Multithreading
return handle;
}
public IProgram CreateProgram(IShader[] shaders, TransformFeedbackDescriptor[] transformFeedbackDescriptors)
public IProgram CreateProgram(IShader[] shaders)
{
var program = new ThreadedProgram(this);
SourceProgramRequest request = new SourceProgramRequest(program, shaders, transformFeedbackDescriptors);
SourceProgramRequest request = new SourceProgramRequest(program, shaders);
Programs.Add(request);
New<CreateProgramCommand>().Set(Ref((IProgramRequest)request));

19
Ryujinx.Graphics.GAL/TransformFeedbackDescriptor.cs
View File

@ -1,19 +0,0 @@
using System;
namespace Ryujinx.Graphics.GAL
{
public struct TransformFeedbackDescriptor
{
public int BufferIndex { get; }
public int Stride { get; }
public byte[] VaryingLocations { get; }
public TransformFeedbackDescriptor(int bufferIndex, int stride, byte[] varyingLocations)
{
BufferIndex = bufferIndex;
Stride = stride;
VaryingLocations = varyingLocations ?? throw new ArgumentNullException(nameof(varyingLocations));
}
}
}