Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 19 additions & 10 deletions lib/gx/shader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1082,14 +1082,21 @@ std::string build_shader_source(const ShaderConfig& config, DstAlphaMode dstAlph
std::array<bool, MaxTevRegs> alphaNormalized{};
for (u32 idx = 0; idx < config.tevStageCount; ++idx) {
const auto& stage = config.tevStages[idx];
const auto color_arg = [&](GXTevColorArg arg) {
auto value = color_arg_reg(arg, idx, config, stage);
if (tev_color_arg_is_normalized(arg, colorNormalized, alphaNormalized)) {
return fmt::format("vec3f({})", value);
}
return fmt::format("tev_overflow_vec3f({})", value);
};
const bool alphaCompareColor =
stage.alphaOp.op >= GX_TEV_COMP_R8_GT && stage.alphaOp.op <= GX_TEV_COMP_BGR24_EQ;
// Packed alpha comparisons use color A/B from before this stage writes its color result.
if (alphaCompareColor) {
fragmentFn += fmt::format("\n let tev_cmp_a{0} = {1};\n let tev_cmp_b{0} = {2};", idx,
color_arg(stage.colorPass.a), color_arg(stage.colorPass.b));
}
{
const auto color_arg = [&](GXTevColorArg arg) {
auto value = color_arg_reg(arg, idx, config, stage);
if (tev_color_arg_is_normalized(arg, colorNormalized, alphaNormalized)) {
return fmt::format("vec3f({})", value);
}
return fmt::format("tev_overflow_vec3f({})", value);
};
std::string_view outReg = regName[stage.colorOp.outReg];
std::string op = tev_color_op(stage.colorOp.op, tev_bias(stage.colorOp.bias), tev_scale(stage.colorOp.scale),
stage.colorOp.clamp, color_arg(stage.colorPass.a), color_arg(stage.colorPass.b),
Expand All @@ -1106,9 +1113,11 @@ std::string build_shader_source(const ShaderConfig& config, DstAlphaMode dstAlph
return fmt::format("tev_overflow_f32({})", value);
};
std::string_view outReg = regName[stage.alphaOp.outReg];
std::string op = tev_alpha_op(stage.alphaOp.op, tev_bias(stage.alphaOp.bias), tev_scale(stage.alphaOp.scale),
stage.alphaOp.clamp, alpha_arg(stage.alphaPass.a), alpha_arg(stage.alphaPass.b),
alpha_arg(stage.alphaPass.c), alpha_arg_reg(stage.alphaPass.d, idx, config, stage));
std::string op = tev_alpha_op(
stage.alphaOp.op, tev_bias(stage.alphaOp.bias), tev_scale(stage.alphaOp.scale), stage.alphaOp.clamp,
alphaCompareColor ? fmt::format("tev_cmp_a{}", idx) : alpha_arg(stage.alphaPass.a),
alphaCompareColor ? fmt::format("tev_cmp_b{}", idx) : alpha_arg(stage.alphaPass.b),
alpha_arg(stage.alphaPass.c), alpha_arg_reg(stage.alphaPass.d, idx, config, stage));
fragmentFn += fmt::format("\n {0}.a = {1};", outReg, op);
alphaNormalized[stage.alphaOp.outReg] = stage.alphaOp.clamp;
}
Expand Down
Loading