From 8d168574eb04ae1e7026ac2b058e3b184f068fae Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 8 Nov 2020 08:10:00 -0300 Subject: Use explicit buffer and texture bindings on shaders (#1666) * Use explicit buffer and texture bindings on shaders * More XML docs and other nits --- Ryujinx.Graphics.GAL/IPipeline.cs | 10 +++++----- Ryujinx.Graphics.GAL/IRenderer.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Ryujinx.Graphics.GAL') diff --git a/Ryujinx.Graphics.GAL/IPipeline.cs b/Ryujinx.Graphics.GAL/IPipeline.cs index 3baf272f..1da34b96 100644 --- a/Ryujinx.Graphics.GAL/IPipeline.cs +++ b/Ryujinx.Graphics.GAL/IPipeline.cs @@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.GAL void SetIndexBuffer(BufferRange buffer, IndexType type); - void SetImage(int index, ShaderStage stage, ITexture texture, Format imageFormat); + void SetImage(int binding, ITexture texture, Format imageFormat); void SetLogicOpState(bool enable, LogicalOp op); @@ -64,19 +64,19 @@ namespace Ryujinx.Graphics.GAL void SetRenderTargetColorMasks(ReadOnlySpan componentMask); void SetRenderTargets(ITexture[] colors, ITexture depthStencil); - void SetSampler(int index, ShaderStage stage, ISampler sampler); + void SetSampler(int binding, ISampler sampler); void SetScissorEnable(int index, bool enable); void SetScissor(int index, int x, int y, int width, int height); void SetStencilTest(StencilTestDescriptor stencilTest); - void SetStorageBuffer(int index, ShaderStage stage, BufferRange buffer); + void SetStorageBuffers(ReadOnlySpan buffers); - void SetTexture(int index, ShaderStage stage, ITexture texture); + void SetTexture(int binding, ITexture texture); void SetTransformFeedbackBuffers(ReadOnlySpan buffers); - void SetUniformBuffer(int index, ShaderStage stage, BufferRange buffer); + void SetUniformBuffers(ReadOnlySpan buffers); void SetUserClipDistance(int index, bool enableClip); diff --git a/Ryujinx.Graphics.GAL/IRenderer.cs b/Ryujinx.Graphics.GAL/IRenderer.cs index 9fc39b4b..35c2146f 100644 --- a/Ryujinx.Graphics.GAL/IRenderer.cs +++ b/Ryujinx.Graphics.GAL/IRenderer.cs @@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.GAL void BackgroundContextAction(Action action); - IShader CompileShader(ShaderProgram shader); + IShader CompileShader(ShaderStage stage, string code); BufferHandle CreateBuffer(int size); -- cgit v1.2.3