Skip to content

Commit e8c47c0

Browse files
gonetzgonetz
committed
Use F3D_TRIX instead of F3D_Tri4.
Fixed #1307
1 parent b4a0d18 commit e8c47c0

File tree

11 files changed

+15
-27
lines changed

11 files changed

+15
-27
lines changed

‎src/F3D.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,6 @@ void F3D_RDPHalf_Cont( u32 w0, u32 w1 )
254254
{
255255
}
256256

257-
void F3D_Tri4( u32 w0, u32 w1 )
258-
{
259-
gSP4Triangles( _SHIFTR( w1, 28, 4 ), _SHIFTR( w0, 12, 4 ), _SHIFTR( w1, 24, 4 ),
260-
_SHIFTR( w1, 20, 4 ), _SHIFTR( w0, 8, 4 ), _SHIFTR( w1, 16, 4 ),
261-
_SHIFTR( w1, 12, 4 ), _SHIFTR( w0, 4, 4 ), _SHIFTR( w1, 8, 4 ),
262-
_SHIFTR( w1, 4, 4 ), _SHIFTR( w0, 0, 4 ), _SHIFTR( w1, 0, 4 ) );
263-
}
264-
265257
void F3D_Init()
266258
{
267259
gSPSetupFunctions();
@@ -296,5 +288,4 @@ void F3D_Init()
296288
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
297289
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
298290
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
299-
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
300291
}

‎src/F3D.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ void F3D_Quad( u32 w0, u32 w1 );
9191
void F3D_RDPHalf_1( u32 w0, u32 w1 );
9292
void F3D_RDPHalf_2( u32 w0, u32 w1 );
9393
void F3D_RDPHalf_Cont( u32 w0, u32 w1 );
94-
void F3D_Tri4( u32 w0, u32 w1 );
9594
void F3D_Init();
9695
#endif
9796

‎src/F3DDKR.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ void F3DDKR_Init()
130130
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
131131
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
132132
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
133-
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
134133

135134
gSPSetDMAOffsets( 0, 0 );
136135
}

‎src/F3DGOLDEN.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
#include "gDP.h"
1111
#include "GBI.h"
1212

13-
#define F3DGOLDEN_TRIX 0xB1
1413
#define F3DGOLDEN_MOVEWORD 0xBD
1514

16-
u32 G_GOLDEN_TRIX;
1715
u32 G_GOLDEN_MOVEWORD;
1816

19-
void F3DGOLDEN_TriX(u32 w0, u32 w1)
17+
void F3D_TriX(u32 w0, u32 w1)
2018
{
2119
while(w1 != 0) {
2220
s32 v0 = w1 & 0xf;
@@ -67,5 +65,5 @@ void F3DGOLDEN_Init()
6765
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
6866
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
6967
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
70-
GBI_SetGBI( G_GOLDEN_TRIX, F3DGOLDEN_TRIX, F3DGOLDEN_TriX );
68+
GBI_SetGBI( G_TRIX, F3D_TRIX, F3D_TriX );
7169
}

‎src/F3DGOLDEN.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#ifndef F3DGOLDEN_H
22
#define F3DGOLDEN_H
33

4+
#define F3D_TRIX 0xB1
5+
46
void F3DGOLDEN_Init();
57

8+
void F3D_TriX(u32 w0, u32 w1);
9+
610
#endif
711

‎src/F3DPD.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#include "GLideN64.h"
22
#include "Debug.h"
33
#include "F3D.h"
4+
#include "F3DGOLDEN.h"
45
#include "F3DPD.h"
56
#include "N64.h"
6-
#include "RSP.h"
7-
#include "RDP.h"
87
#include "gSP.h"
9-
#include "gDP.h"
10-
#include "GBI.h"
8+
9+
#define F3DPD_VTXCOLORBASE 0x07
1110

1211
void F3DPD_Vtx( u32 w0, u32 w1 )
1312
{
@@ -53,7 +52,7 @@ void F3DPD_Init()
5352
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
5453
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
5554
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
56-
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
55+
GBI_SetGBI( G_TRIX, F3D_TRIX, F3D_TriX );
5756

5857
gSPSetDMAOffsets( 0, 0 );
5958
}

‎src/F3DPD.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#ifndef F3DPD_H
22
#define F3DPD_H
33

4-
#define F3DPD_VTXCOLORBASE 0x07
5-
64
void F3DPD_Init();
5+
76
#endif
87

‎src/F3DSETA.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,4 @@ void F3DSETA_Init()
110110
GBI_SetGBI( G_RDPHALF_1, F3DSETA_RDPHALF_1, F3D_RDPHalf_1 );
111111
GBI_SetGBI( G_RDPHALF_2, F3DSETA_RDPHALF_2, F3D_RDPHalf_2 );
112112
GBI_SetGBI( G_RDPHALF_CONT, F3DSETA_RDPHALF_CONT, F3D_RDPHalf_Cont );
113-
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
114113
}

‎src/GBI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ u32 G_TEXTURE;
6969
u32 G_DMA_IO, G_DMA_DL, G_DMA_TRI, G_DMA_MTX, G_DMA_VTX, G_DMA_TEX_OFFSET, G_DMA_OFFSETS;
7070
u32 G_SPECIAL_1, G_SPECIAL_2, G_SPECIAL_3;
7171
u32 G_VTX, G_MODIFYVTX, G_VTXCOLORBASE;
72-
u32 G_TRI1, G_TRI2, G_TRI4;
72+
u32 G_TRI1, G_TRI2, G_TRIX;
7373
u32 G_QUAD, G_LINE3D;
7474
u32 G_RESERVED0, G_RESERVED1, G_RESERVED2, G_RESERVED3;
7575
u32 G_SPRITE2D_BASE;
@@ -166,7 +166,7 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
166166

167167
RDP_Init();
168168

169-
G_TRI1 = G_TRI2 = G_TRI4 = G_QUAD = -1; // For correct work of gSPFlushTriangles()
169+
G_TRI1 = G_TRI2 = G_TRIX = G_QUAD = -1; // For correct work of gSPFlushTriangles()
170170

171171
switch (m_pCurrent->type) {
172172
case F3D: F3D_Init(); break;

‎src/GBI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ extern u32 G_TEXTURE;
588588
extern u32 G_DMA_IO, G_DMA_DL, G_DMA_TRI, G_DMA_MTX, G_DMA_VTX, G_DMA_TEX_OFFSET, G_DMA_OFFSETS;
589589
extern u32 G_SPECIAL_1, G_SPECIAL_2, G_SPECIAL_3;
590590
extern u32 G_VTX, G_MODIFYVTX, G_VTXCOLORBASE;
591-
extern u32 G_TRI1, G_TRI2, G_TRI4;
591+
extern u32 G_TRI1, G_TRI2, G_TRIX;
592592
extern u32 G_QUAD, G_LINE3D;
593593
extern u32 G_RESERVED0, G_RESERVED1, G_RESERVED2, G_RESERVED3;
594594
extern u32 G_SPRITE2D_BASE;

0 commit comments

Comments
 (0)