Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
metal: make generated shader code slightly more readable.
  • Loading branch information
icculus committed May 28, 2016
1 parent 9935e14 commit 0e482b3
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions mojoshader.c
Expand Up @@ -4541,7 +4541,7 @@ static void emit_METAL_finalize(Context *ctx)
output_line(ctx, "%s %s%s %s (",
shader_is_vertex(ctx) ? "vertex" : "fragment",
ctx->outputs ? ctx->mainfn : "void",
ctx->outputs ? "Output" : "", ctx->mainfn);
ctx->outputs ? "_Output" : "", ctx->mainfn);
pop_output(ctx);

push_output(ctx, &ctx->mainline_arguments);
Expand All @@ -4556,7 +4556,7 @@ static void emit_METAL_finalize(Context *ctx)
if (uniform_count > 0)
{
push_output(ctx, &ctx->globals);
output_line(ctx, "struct %sUniforms", ctx->mainfn);
output_line(ctx, "struct %s_Uniforms", ctx->mainfn);
output_line(ctx, "{");
ctx->indent++;
if (ctx->uniform_float4_count > 0)
Expand All @@ -4569,13 +4569,13 @@ static void emit_METAL_finalize(Context *ctx)
output_line(ctx, "};");
pop_output(ctx);

output_line(ctx, "constant %sUniforms &uniforms [[buffer(16)]]%s", ctx->mainfn, commas ? "," : "");
output_line(ctx, "constant %s_Uniforms &uniforms [[buffer(16)]]%s", ctx->mainfn, commas ? "," : "");
commas--;
} // if

if (ctx->inputs)
{
output_line(ctx, "%sInput input [[stage_in]]%s", ctx->mainfn, commas ? "," : "");
output_line(ctx, "%s_Input input [[stage_in]]%s", ctx->mainfn, commas ? "," : "");
commas--;
} // if

Expand All @@ -4584,7 +4584,7 @@ static void emit_METAL_finalize(Context *ctx)
if (ctx->outputs)
{
ctx->indent++;
output_line(ctx, "%sOutput output;", ctx->mainfn);
output_line(ctx, "%s_Output output;", ctx->mainfn);

push_output(ctx, &ctx->mainline);
ctx->indent++;
Expand Down Expand Up @@ -4878,7 +4878,7 @@ static void emit_METAL_attribute(Context *ctx, RegisterType regtype, int regnum,
push_output(ctx, &ctx->inputs);
if (buffer_size(ctx->inputs) == 0)
{
output_line(ctx, "struct %sInput", ctx->mainfn);
output_line(ctx, "struct %s_Input", ctx->mainfn);
output_line(ctx, "{");
} // if

Expand All @@ -4903,7 +4903,7 @@ static void emit_METAL_attribute(Context *ctx, RegisterType regtype, int regnum,
push_output(ctx, &ctx->outputs);
if (buffer_size(ctx->outputs) == 0)
{
output_line(ctx, "struct %sOutput", ctx->mainfn);
output_line(ctx, "struct %s_Output", ctx->mainfn);
output_line(ctx, "{");
} // if

Expand Down Expand Up @@ -4966,7 +4966,7 @@ static void emit_METAL_attribute(Context *ctx, RegisterType regtype, int regnum,
push_output(ctx, &ctx->outputs);
if (buffer_size(ctx->outputs) == 0)
{
output_line(ctx, "struct %sOutput", ctx->mainfn);
output_line(ctx, "struct %s_Output", ctx->mainfn);
output_line(ctx, "{");
} // if
ctx->indent++;
Expand Down Expand Up @@ -4999,7 +4999,7 @@ static void emit_METAL_attribute(Context *ctx, RegisterType regtype, int regnum,
push_output(ctx, &ctx->inputs);
if (buffer_size(ctx->inputs) == 0)
{
output_line(ctx, "struct %sInput", ctx->mainfn);
output_line(ctx, "struct %s_Input", ctx->mainfn);
output_line(ctx, "{");
} // if
ctx->indent++;
Expand Down

0 comments on commit 0e482b3

Please sign in to comment.