Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplifying plate Metal shader #1546

Merged
merged 1 commit into from
Dec 31, 2023
Merged

Simplifying plate Metal shader #1546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Sources/Plasma/FeatureLib/pfMetalPipeline/ShaderSrc/PlateShaders.metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ typedef struct
{
float4 position [[position]];
float3 texCoord;
float4 normal;
} ColorInOut;

vertex ColorInOut plateVertexShader(PlateVertex in [[stage_in]],
Expand All @@ -83,15 +82,14 @@ vertex ColorInOut plateVertexShader(PlateVertex in [[stage_in]],
out.position.y *= -1.f;
out.texCoord = (float4(in.texCoord, 1.0) * uniforms.uvTransforms[0].transform).xyz;
out.texCoord.y = 1.f - out.texCoord.y;
out.normal = float4(0.f, 0.f, 1.f, 0.f);

return out;
}

fragment float4 fragmentShader(ColorInOut in [[stage_in]],
constant VertexUniforms & uniforms [[ buffer(VertexShaderArgumentFixedFunctionUniforms) ]],
constant float & alpha [[ buffer(6) ]],
texture2d<half> colorMap [[ texture(FragmentShaderArgumentTexture) ]])
fragment half4 fragmentShader(ColorInOut in [[stage_in]],
constant VertexUniforms & uniforms [[ buffer(VertexShaderArgumentFixedFunctionUniforms) ]],
constant float & alpha [[ buffer(6) ]],
texture2d<half> colorMap [[ texture(FragmentShaderArgumentTexture) ]])
{
constexpr sampler colorSampler(mip_filter::linear,
mag_filter::linear,
Expand All @@ -100,5 +98,5 @@ fragment float4 fragmentShader(ColorInOut in [[stage_in]],
half4 colorSample = colorMap.sample(colorSampler, in.texCoord.xy);
colorSample.a *= alpha;

return float4(colorSample);
return colorSample;
}