AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

GX: fix uploading post transform matrices

This commit is contained in:
Phillip Stephens 2022-03-24 01:03:41 -07:00
parent 9bc0e7f2e6
commit 51a1b6ba9b
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Graphics/CGraphics.cpp
View File

@ -228,7 +228,10 @@ void CGraphics::DoRender2D(const CTexture& tex, s32 x, s32 y, s32 w1, s32 w2, s3
void CGraphics::EndRender2D(bool v) {} void CGraphics::EndRender2D(bool v) {}
void CGraphics::SetAlphaCompare(ERglAlphaFunc comp0, u8 ref0, ERglAlphaOp op, ERglAlphaFunc comp1, u8 ref1) {} void CGraphics::SetAlphaCompare(ERglAlphaFunc comp0, u8 ref0, ERglAlphaOp op, ERglAlphaFunc comp1, u8 ref1) {
CGX::SetAlphaCompare(static_cast<GX::Compare>(comp0), ref0, static_cast<GX::AlphaOp>(op),
static_cast<GX::Compare>(comp1), ref1);
}
void CGraphics::SetViewPointMatrix(const zeus::CTransform& xf) { void CGraphics::SetViewPointMatrix(const zeus::CTransform& xf) {
g_ViewMatrix = xf; g_ViewMatrix = xf;

2
aurora/lib/gfx/gx.cpp
View File

@ -597,7 +597,7 @@ Range build_uniform(const ShaderInfo& info) noexcept {
if (!info.usesPTTexMtx.test(i)) { if (!info.usesPTTexMtx.test(i)) {
continue; continue;
} }
buf.append(&g_gxState.ptTexMtxs[i], 48); buf.append(&g_gxState.ptTexMtxs[i], 64);
} }
if (info.usesFog) { if (info.usesFog) {
const auto& state = g_gxState.fog; const auto& state = g_gxState.fog;

2
aurora/lib/gfx/gx_shader.cpp
View File

@ -359,7 +359,7 @@ static std::string alpha_compare(GX::Compare comp, float ref, bool& valid) {
case GX::GEQUAL: case GX::GEQUAL:
return fmt::format(FMT_STRING("(prev.a >= {}f)"), ref); return fmt::format(FMT_STRING("(prev.a >= {}f)"), ref);
case GX::GREATER: case GX::GREATER:
return fmt::format(FMT_STRING("(prev.a < {}f)"), ref); return fmt::format(FMT_STRING("(prev.a > {}f)"), ref);
case GX::ALWAYS: case GX::ALWAYS:
valid = false; valid = false;
return "true"; return "true";

2
extern/dawn vendored

@ -1 +1 @@
Subproject commit 5772c54b9935f5e294c522ef5741ce888f33457c Subproject commit 64ffca228bbf642b3302e9d59d44762352717771