owen/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryubing/Ryujinx.git synced 2025-11-26 19:02:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Shader Extra Set Support + Cleanup (#36)

Browse Source 
Separate samplers are now supported and arrays in constant sets are bound
This commit is contained in:
Isaac Marovitz
2024-07-31 23:32:37 +01:00
committed by Evan Husted
parent 5b88ea66ba
commit 80bb95dfb9
20 changed files with 412 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ryujinx.Graphics.Metal/Shaders/Blit.metal
View File

@@ -22,7 +22,7 @@ struct Textures
};
vertex CopyVertexOut vertexMain(uint vid [[vertex_id]],
constant ConstantBuffers &constant_buffers [[buffer(20)]]) {
constant ConstantBuffers &constant_buffers [[buffer(CONSTANT_BUFFERS_INDEX)]]) {
CopyVertexOut out;
int low = vid & 1;
@@ -38,6 +38,6 @@ vertex CopyVertexOut vertexMain(uint vid [[vertex_id]],
}
fragment float4 fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]]) {
constant Textures &textures [[buffer(TEXTURES_INDEX)]]) {
return textures.texture.sample(textures.sampler, in.uv);
}

2
src/Ryujinx.Graphics.Metal/Shaders/BlitMs.metal
View File

@@ -13,7 +13,7 @@ struct Textures
};
fragment float4 fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]],
constant Textures &textures [[buffer(TEXTURES_INDEX)]],
uint sample_id [[sample_id]]) {
uint2 tex_size = uint2(textures.texture.get_width(), textures.texture.get_height());
uint2 tex_coord = uint2(in.uv * float2(tex_size));

4
src/Ryujinx.Graphics.Metal/Shaders/ChangeBufferStride.metal
View File

@@ -23,8 +23,8 @@ struct StorageBuffers {
device OutData* out_data;
};
kernel void kernelMain(constant ConstantBuffers &constant_buffers [[buffer(20)]],
device StorageBuffers &storage_buffers [[buffer(21)]],
kernel void kernelMain(constant ConstantBuffers &constant_buffers [[buffer(CONSTANT_BUFFERS_INDEX)]],
device StorageBuffers &storage_buffers [[buffer(STORAGE_BUFFERS_INDEX)]],
uint3 thread_position_in_grid [[thread_position_in_grid]],
uint3 threads_per_threadgroup [[threads_per_threadgroup]],
uint3 threadgroups_per_grid [[threads_per_grid]])

2
src/Ryujinx.Graphics.Metal/Shaders/ColorClear.metal
View File

@@ -33,6 +33,6 @@ struct FragmentOut {
};
fragment FragmentOut fragmentMain(VertexOut in [[stage_in]],
constant ConstantBuffers &constant_buffers [[buffer(20)]]) {
constant ConstantBuffers &constant_buffers [[buffer(CONSTANT_BUFFERS_INDEX)]]) {
return {constant_buffers.clear_color->data};
}

2
src/Ryujinx.Graphics.Metal/Shaders/DepthBlit.metal
View File

@@ -18,7 +18,7 @@ struct FragmentOut {
};
fragment FragmentOut fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]]) {
constant Textures &textures [[buffer(TEXTURES_INDEX)]]) {
FragmentOut out;
out.depth = textures.texture.sample(textures.sampler, in.uv).r;

2
src/Ryujinx.Graphics.Metal/Shaders/DepthBlitMs.metal
View File

@@ -17,7 +17,7 @@ struct FragmentOut {
};
fragment FragmentOut fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]],
constant Textures &textures [[buffer(TEXTURES_INDEX)]],
uint sample_id [[sample_id]]) {
FragmentOut out;

2
src/Ryujinx.Graphics.Metal/Shaders/DepthStencilClear.metal
View File

@@ -33,7 +33,7 @@ vertex VertexOut vertexMain(ushort vid [[vertex_id]]) {
}
fragment FragmentOut fragmentMain(VertexOut in [[stage_in]],
constant ConstantBuffers &constant_buffers [[buffer(20)]]) {
constant ConstantBuffers &constant_buffers [[buffer(CONSTANT_BUFFERS_INDEX)]]) {
FragmentOut out;
out.depth = constant_buffers.clear_depth->data;

2
src/Ryujinx.Graphics.Metal/Shaders/StencilBlit.metal
View File

@@ -18,7 +18,7 @@ struct FragmentOut {
};
fragment FragmentOut fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]]) {
constant Textures &textures [[buffer(TEXTURES_INDEX)]]) {
FragmentOut out;
out.stencil = textures.texture.sample(textures.sampler, in.uv).r;

2
src/Ryujinx.Graphics.Metal/Shaders/StencilBlitMs.metal
View File

@@ -17,7 +17,7 @@ struct FragmentOut {
};
fragment FragmentOut fragmentMain(CopyVertexOut in [[stage_in]],
constant Textures &textures [[buffer(22)]],
constant Textures &textures [[buffer(TEXTURES_INDEX)]],
uint sample_id [[sample_id]]) {
FragmentOut out;