encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

more J3DDrawBuffer

Browse Source
This commit is contained in:
Jasper St. Pierre
2022-12-31 19:32:56 -08:00
parent b95aed1512
commit 6557ac8cd7
11 changed files with 80 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+63 -28
View File
@@ -8,6 +8,7 @@
#include "dol2asm.h"
#include "dolphin/types.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
//
// Forward References:
@@ -90,48 +91,82 @@ J3DDrawBuffer::~J3DDrawBuffer() {
mpBuf = NULL;
}
#ifdef NONMATCHING
/* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text frameInit__13J3DDrawBufferFv */
void J3DDrawBuffer::frameInit() {
// can't make mwcc not generate "mtctr" for this loop
for (int i = 0; i < mBufSize; i++)
u32 bufSize = mBufSize;
for (u32 i = 0; i < bufSize; i++)
mpBuf[i] = NULL;
mpCallBackPacket = NULL;
}
#else
/* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text frameInit__13J3DDrawBufferFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DDrawBuffer::frameInit() {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/frameInit__13J3DDrawBufferFv.s"
}
#pragma pop
#endif
/* 8032509C-803251E4 31F9DC 0148+00 2/1 0/0 0/0 .text
* entryMatSort__13J3DDrawBufferFP12J3DMatPacket */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int J3DDrawBuffer::entryMatSort(J3DMatPacket* param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatSort__13J3DDrawBufferFP12J3DMatPacket.s"
int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
pMatPacket->drawClear();
pMatPacket->getShapePacket()->drawClear();
if (pMatPacket->isChanged()) {
pMatPacket->setNextPacket(mpBuf[0]);
mpBuf[0] = pMatPacket;
return 1;
}
J3DTexture* texture = j3dSys.getTexture();
u32 hash;
u32 texNo = pMatPacket->getMaterial()->getTexNo(0);
if ((u16)texNo == 0xFFFF) {
hash = 0;
} else {
hash = ((u32)texture->getResTIMG(texNo) + texture->getResTIMG(texNo)->imageOffset) >> 5;
}
u32 slot = hash & (mBufSize - 1);
if (mpBuf[slot] == NULL) {
mpBuf[slot] = pMatPacket;
return 1;
} else {
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL; pkt = (J3DMatPacket*)pkt->getNextPacket()) {
if (pkt->isSame(pMatPacket)) {
pkt->addShapePacket(pMatPacket->getShapePacket());
return 0;
}
}
pMatPacket->setNextPacket(mpBuf[slot]);
mpBuf[slot] = pMatPacket;
return 1;
}
}
#pragma pop
/* 803251E4-8032529C 31FB24 00B8+00 1/0 0/0 0/0 .text
* entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* param_0) {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket.s"
int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
J3DMaterialAnm* pMaterialAnm = pMatPacket->mpMaterialAnm;
u32 slot = (u32)pMaterialAnm & (mBufSize - 1);
if (pMaterialAnm == NULL) {
return entryMatSort(pMatPacket);
} else {
pMatPacket->drawClear();
pMatPacket->getShapePacket()->drawClear();
if (mpBuf[slot] == NULL) {
mpBuf[slot] = pMatPacket;
return 1;
} else {
for (J3DMatPacket* pkt = (J3DMatPacket*)mpBuf[slot]; pkt != NULL; pkt = (J3DMatPacket*)pkt->getNextPacket()) {
if (pkt->mpMaterialAnm == pMaterialAnm) {
pkt->addShapePacket(pMatPacket->getShapePacket());
return 0;
}
}
pMatPacket->setNextPacket(mpBuf[slot]);
mpBuf[slot] = pMatPacket;
return 1;
}
}
}
#pragma pop
inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
register f32 out;
libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
+5 -5
View File
@@ -2586,7 +2586,7 @@ asm void J3DTevBlock16::setTexNo(u32 param_0, u16 const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock16::getTexNo(u32 param_0) const {
asm u32 J3DTevBlock16::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNo__13J3DTevBlock16CFUl.s"
}
@@ -3639,7 +3639,7 @@ asm void J3DTevBlock4::setTexNo(u32 param_0, u16 const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock4::getTexNo(u32 param_0) const {
asm u32 J3DTevBlock4::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNo__12J3DTevBlock4CFUl.s"
}
@@ -4032,7 +4032,7 @@ asm void J3DTevBlock2::setTexNo(u32 param_0, u16 const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock2::getTexNo(u32 param_0) const {
asm u32 J3DTevBlock2::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNo__12J3DTevBlock2CFUl.s"
}
@@ -4425,7 +4425,7 @@ asm void J3DTevBlock1::setTexNo(u32 param_0, u16 const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlock1::getTexNo(u32 param_0) const {
asm u32 J3DTevBlock1::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNo__12J3DTevBlock1CFUl.s"
}
@@ -4679,7 +4679,7 @@ asm void J3DTevBlockPatched::setTexNo(u32 param_0, u16 const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J3DTevBlockPatched::getTexNo(u32 param_0) const {
asm u32 J3DTevBlockPatched::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J3DGraphBase/J3DMatBlock/getTexNo__18J3DTevBlockPatchedCFUl.s"
}