Skip to content

Commit 1112b1e

Browse files
committed
Fix CMoviePlayer using the wrong attributes for rendering
1 parent 5d6be8f commit 1112b1e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Runtime/Graphics/CMoviePlayer.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ static void MyTHPGXYuv2RgbSetup(bool interlaced2ndFrame, bool fieldFlip) {
7878
GXSetColorUpdate(true);
7979
GXSetAlphaUpdate(false);
8080
GXInvalidateTexAll();
81-
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
82-
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_TEX0, GX_TEX_ST, GX_U16, 0);
81+
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
82+
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBX8, 0);
8383
CGX::SetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD1, GX_TEXMAP1, GX_COLOR_NULL);
8484
CGX::SetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_KONST, GX_CC_C0);
8585
CGX::SetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, false, GX_TEVPREV);
@@ -543,21 +543,21 @@ void CMoviePlayer::DrawFrame(const zeus::CVector3f& v1, const zeus::CVector3f& v
543543
// CTHPTextureSet& tex = x80_textures[xd0_drawTexSlot];
544544
// aurora::gfx::queue_movie_player(tex.Y[m_deinterlace ? (xfc_fieldIndex != 0) : 0], tex.U, tex.V, hPad, vPad);
545545

546-
MyTHPGXYuv2RgbSetup(true /*CGraphics::g_LastFrameUsedAbove*/, xf4_26_fieldFlip);
546+
MyTHPGXYuv2RgbSetup(CGraphics::mLastFrameUsedAbove, xf4_26_fieldFlip);
547547
uintptr_t planeSize = x6c_videoInfo.width * x6c_videoInfo.height;
548548
uintptr_t planeSizeQuarter = planeSize / 4;
549549
MyTHPYuv2RgbTextureSetup(m_yuvBuf.get(), m_yuvBuf.get() + planeSize, m_yuvBuf.get() + planeSize + planeSizeQuarter,
550550
x6c_videoInfo.width, x6c_videoInfo.height);
551551

552552
CGX::Begin(GX_TRIANGLEFAN, GX_VTXFMT7, 4);
553553
GXPosition3f32(v1);
554-
GXTexCoord2f32(0.f, 0.f);
554+
GXTexCoord2u16(0, 0);
555555
GXPosition3f32(v3);
556-
GXTexCoord2f32(0.f, 1.f);
556+
GXTexCoord2u16(0, 1);
557557
GXPosition3f32(v4);
558-
GXTexCoord2f32(1.f, 1.f);
558+
GXTexCoord2u16(1, 1);
559559
GXPosition3f32(v2);
560-
GXTexCoord2f32(1.f, 0.f);
560+
GXTexCoord2u16(1, 0);
561561
CGX::End();
562562
MyTHPGXRestore();
563563

0 commit comments

Comments
 (0)