MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove ucode F3DSWE.

Browse Source 
Rename ucode F3DWRUS to F3DBETA and use it for both Wave Race (U) and
Star Wars Shadows of Empire
This commit is contained in:
Sergey Lipskiy 2016-12-21 22:14:36 +07:00
parent 43d281e5bd
commit 52b95f6dd5
11 changed files with 36 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/msvc12/GLideN64.vcxproj
View File

@ -283,7 +283,7 @@
<ClCompile Include="..\..\src\F3DEX2MM.cpp" />
<ClCompile Include="..\..\src\F3DGOLDEN.cpp" />
<ClCompile Include="..\..\src\F3DSETA.cpp" />
<ClCompile Include="..\..\src\F3DSWSE.cpp" />
<ClCompile Include="..\..\src\F3DBETA.cpp" />
<ClCompile Include="..\..\src\FBOTextureFormats.cpp" />
<ClCompile Include="..\..\src\FrameBuffer.cpp" />
<ClCompile Include="..\..\src\FrameBufferInfo.cpp" />
@ -343,7 +343,6 @@
<ClCompile Include="..\..\src\F3DEX.cpp" />
<ClCompile Include="..\..\src\F3DEX2.cpp" />
<ClCompile Include="..\..\src\F3DPD.cpp" />
<ClCompile Include="..\..\src\F3DWRUS.cpp" />
<ClCompile Include="..\..\src\L3D.cpp" />
<ClCompile Include="..\..\src\L3DEX.cpp" />
<ClCompile Include="..\..\src\L3DEX2.cpp" />
@ -403,7 +402,6 @@
<ClInclude Include="..\..\src\F3DEX2MM.h" />
<ClInclude Include="..\..\src\F3DGOLDEN.h" />
<ClInclude Include="..\..\src\F3DSETA.h" />
<ClInclude Include="..\..\src\F3DSWSE.h" />
<ClInclude Include="..\..\src\FBOTextureFormats.h" />
<ClInclude Include="..\..\src\FrameBuffer.h" />
<ClInclude Include="..\..\src\FrameBufferInfo.h" />
@ -453,7 +451,7 @@
<ClInclude Include="..\..\src\F3DEX.h" />
<ClInclude Include="..\..\src\F3DEX2.h" />
<ClInclude Include="..\..\src\F3DPD.h" />
<ClInclude Include="..\..\src\F3DWRUS.h" />
<ClInclude Include="..\..\src\F3DBETA.h" />
<ClInclude Include="..\..\src\L3D.h" />
<ClInclude Include="..\..\src\L3DEX.h" />
<ClInclude Include="..\..\src\L3DEX2.h" />

18
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -113,9 +113,6 @@
<ClCompile Include="..\..\src\F3DPD.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\F3DWRUS.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\L3D.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
@ -182,9 +179,6 @@
<ClCompile Include="..\..\src\ZSort.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\F3DSWSE.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\TextDrawer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -269,6 +263,9 @@
<ClCompile Include="..\..\src\F3DEX2MM.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\F3DBETA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
@ -343,9 +340,6 @@
<ClInclude Include="..\..\src\F3DPD.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\F3DWRUS.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\L3D.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
@ -385,9 +379,6 @@
<ClInclude Include="..\..\src\ZSort.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\F3DSWSE.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GLideNHQ\Ext_TxFilter.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -481,5 +472,8 @@
<ClInclude Include="..\..\src\F3DEX2MM.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\F3DBETA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
</ItemGroup>
</Project>

3
src/CMakeLists.txt
View File

@ -19,8 +19,7 @@ set(GLideN64_SOURCES
F3DEX.cpp
F3DPD.cpp
F3DGOLDEN.cpp
F3DWRUS.cpp
F3DSWSE.cpp
F3DBETA.cpp
F3DSETA.cpp
F3DEX2.cpp
F3DEX2CBFD.cpp

20
src/F3DWRUS.cpp → src/F3DBETA.cpp
View File

@ -2,7 +2,7 @@
#include "Debug.h"
#include "F3D.h"
#include "F3DEX.h"
#include "F3DWRUS.h"
#include "F3DBETA.h"
#include "N64.h"
#include "RSP.h"
#include "RDP.h"
@ -10,31 +10,31 @@
#include "gDP.h"
#include "GBI.h"
void F3DWRUS_Vtx( u32 w0, u32 w1 )
void F3DBETA_Vtx( u32 w0, u32 w1 )
{
gSPVertex( w1, _SHIFTR( w0, 9, 7 ), _SHIFTR( w0, 16, 8 ) / 5 );
}
void F3DWRUS_Tri1( u32 w0, u32 w1 )
void F3DBETA_Tri1( u32 w0, u32 w1 )
{
gSP1Triangle( _SHIFTR( w1, 16, 8 ) / 5,
_SHIFTR( w1, 8, 8 ) / 5,
_SHIFTR( w1, 0, 8 ) / 5);
}
void F3DWRUS_Tri2( u32 w0, u32 w1 )
void F3DBETA_Tri2( u32 w0, u32 w1 )
{
gSP2Triangles( _SHIFTR( w0, 16, 8 ) / 5, _SHIFTR( w0, 8, 8 ) / 5, _SHIFTR( w0, 0, 8 ) / 5, 0,
_SHIFTR( w1, 16, 8 ) / 5, _SHIFTR( w1, 8, 8 ) / 5, _SHIFTR( w1, 0, 8 ) / 5, 0);
}
void F3DWRUS_Quad( u32 w0, u32 w1 )
void F3DBETA_Quad( u32 w0, u32 w1 )
{
gSP1Quadrangle( _SHIFTR( w1, 24, 8 ) / 5, _SHIFTR( w1, 16, 8 ) / 5, _SHIFTR( w1, 8, 8 ) / 5, _SHIFTR( w1, 0, 8 ) / 5 );
}
void F3DWRUS_Init()
void F3DBETA_Init()
{
gSPSetupFunctions();
// Set GeometryMode flags
@ -47,14 +47,14 @@ void F3DWRUS_Init()
GBI_SetGBI( G_MTX, F3D_MTX, F3D_Mtx );
GBI_SetGBI( G_RESERVED0, F3D_RESERVED0, F3D_Reserved0 );
GBI_SetGBI( G_MOVEMEM, F3D_MOVEMEM, F3D_MoveMem );
GBI_SetGBI( G_VTX, F3D_VTX, F3DWRUS_Vtx );
GBI_SetGBI( G_VTX, F3D_VTX, F3DBETA_Vtx );
GBI_SetGBI( G_RESERVED1, F3D_RESERVED1, F3D_Reserved1 );
GBI_SetGBI( G_DL, F3D_DL, F3D_DList );
GBI_SetGBI( G_RESERVED2, F3D_RESERVED2, F3D_Reserved2 );
GBI_SetGBI( G_RESERVED3, F3D_RESERVED3, F3D_Reserved3 );
GBI_SetGBI( G_SPRITE2D_BASE, F3D_SPRITE2D_BASE, F3D_Sprite2D_Base );
GBI_SetGBI( G_TRI1, F3D_TRI1, F3DWRUS_Tri1 );
GBI_SetGBI( G_TRI1, F3D_TRI1, F3DBETA_Tri1 );
GBI_SetGBI( G_CULLDL, F3D_CULLDL, F3D_CullDL );
GBI_SetGBI( G_POPMTX, F3D_POPMTX, F3D_PopMtx );
GBI_SetGBI( G_MOVEWORD, F3D_MOVEWORD, F3D_MoveWord );
@ -64,10 +64,10 @@ void F3DWRUS_Init()
GBI_SetGBI( G_ENDDL, F3D_ENDDL, F3D_EndDL );
GBI_SetGBI( G_SETGEOMETRYMODE, F3D_SETGEOMETRYMODE, F3D_SetGeometryMode );
GBI_SetGBI( G_CLEARGEOMETRYMODE, F3D_CLEARGEOMETRYMODE, F3D_ClearGeometryMode );
GBI_SetGBI( G_QUAD, F3D_QUAD, F3DWRUS_Quad );
GBI_SetGBI( G_QUAD, F3D_QUAD, F3DBETA_Quad );
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
GBI_SetGBI( G_TRI2, F3DWRUS_TRI2, F3DWRUS_Tri2 );
GBI_SetGBI( G_TRI2, F3DBETA_TRI2, F3DBETA_Tri2 );
}

8
src/F3DBETA.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef F3DBETA_H
#define F3DBETA_H
#define F3DBETA_TRI2 0xB1
void F3DBETA_Init();
#endif

67
src/F3DSWSE.cpp
View File

@ -1,67 +0,0 @@
#include "GLideN64.h"
#include "Debug.h"
#include "F3D.h"
#include "F3DEX.h"
#include "F3DSWSE.h"
#include "N64.h"
#include "RSP.h"
#include "RDP.h"
#include "gSP.h"
#include "gDP.h"
#include "GBI.h"
void F3DSWSE_Vtx( u32 w0, u32 w1 )
{
gSPVertex(w1, _SHIFTR(w0, 4, 12) / 33 + 1, 0);
}
void F3DSWSE_Tri1( u32 w0, u32 w1 )
{
gSP1Triangle( _SHIFTR( w1, 16, 8 ) / 5,
_SHIFTR( w1, 8, 8 ) / 5,
_SHIFTR( w1, 0, 8 ) / 5);
}
void F3DSWSE_Quad( u32 w0, u32 w1 )
{
gSP1Quadrangle( _SHIFTR( w1, 24, 8 ) / 5, _SHIFTR( w1, 16, 8 ) / 5, _SHIFTR( w1, 8, 8 ) / 5, _SHIFTR( w1, 0, 8 ) / 5 );
}
void F3DSWSE_Init()
{
gSPSetupFunctions();
// Set GeometryMode flags
GBI_InitFlags( F3D );
GBI.PCStackSize = 18;
// GBI Command Command Value Command Function
GBI_SetGBI( G_SPNOOP, F3D_SPNOOP, F3D_SPNoOp );
GBI_SetGBI( G_MTX, F3D_MTX, F3D_Mtx );
GBI_SetGBI( G_RESERVED0, F3D_RESERVED0, F3D_Reserved0 );
GBI_SetGBI( G_MOVEMEM, F3D_MOVEMEM, F3D_MoveMem );
GBI_SetGBI( G_VTX, F3D_VTX, F3DSWSE_Vtx );
GBI_SetGBI( G_RESERVED1, F3D_RESERVED1, F3D_Reserved1 );
GBI_SetGBI( G_DL, F3D_DL, F3D_DList );
GBI_SetGBI( G_RESERVED2, F3D_RESERVED2, F3D_Reserved2 );
GBI_SetGBI( G_RESERVED3, F3D_RESERVED3, F3D_Reserved3 );
GBI_SetGBI( G_SPRITE2D_BASE, F3D_SPRITE2D_BASE, F3D_Sprite2D_Base );
GBI_SetGBI( G_TRI1, F3D_TRI1, F3DSWSE_Tri1 );
GBI_SetGBI( G_CULLDL, F3D_CULLDL, F3D_CullDL );
GBI_SetGBI( G_POPMTX, F3D_POPMTX, F3D_PopMtx );
GBI_SetGBI( G_MOVEWORD, F3D_MOVEWORD, F3D_MoveWord );
GBI_SetGBI( G_TEXTURE, F3D_TEXTURE, F3D_Texture );
GBI_SetGBI( G_SETOTHERMODE_H, F3D_SETOTHERMODE_H, F3D_SetOtherMode_H );
GBI_SetGBI( G_SETOTHERMODE_L, F3D_SETOTHERMODE_L, F3D_SetOtherMode_L );
GBI_SetGBI( G_ENDDL, F3D_ENDDL, F3D_EndDL );
GBI_SetGBI( G_SETGEOMETRYMODE, F3D_SETGEOMETRYMODE, F3D_SetGeometryMode );
GBI_SetGBI( G_CLEARGEOMETRYMODE, F3D_CLEARGEOMETRYMODE, F3D_ClearGeometryMode );
GBI_SetGBI( G_QUAD, F3D_QUAD, F3DSWSE_Quad );
GBI_SetGBI( G_RDPHALF_1, F3D_RDPHALF_1, F3D_RDPHalf_1 );
GBI_SetGBI( G_RDPHALF_2, F3D_RDPHALF_2, F3D_RDPHalf_2 );
GBI_SetGBI( G_RDPHALF_CONT, F3D_RDPHALF_CONT, F3D_RDPHalf_Cont );
GBI_SetGBI( G_TRI4, F3D_TRI4, F3D_Tri4 );
}

7
src/F3DSWSE.h
View File

@ -1,7 +0,0 @@
#ifndef F3DSWSE_H
#define F3DSWSE_H
void F3DSWSE_Init();
#endif

8
src/F3DWRUS.h
View File

@ -1,8 +0,0 @@
#ifndef F3DWRUS_H
#define F3DWRUS_H
#define F3DWRUS_TRI2 0xB1
void F3DWRUS_Init();
#endif

10
src/GBI.cpp
View File

@ -19,8 +19,7 @@
#include "S2DEX.h"
#include "S2DEX2.h"
#include "F3DDKR.h"
#include "F3DSWSE.h"
#include "F3DWRUS.h"
#include "F3DBETA.h"
#include "F3DPD.h"
#include "F3DSETA.h"
#include "F3DGOLDEN.h"
@ -42,8 +41,8 @@ SpecialMicrocodeInfo specialMicrocodes[] =
{ F3D, false, 0x4AED6B3B, "Fast3D" }, //Vivid Dolls [ALECK64]
{ F3DSETA, false, 0x2edee7be, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DWRUS, false, 0xd17906e2, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DSWSE, false, 0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" },
{ F3DBETA, false, 0xd17906e2, "RSP SW Version: 2.0D, 04-01-96" }, // Wave Race (U)
{ F3DBETA, false, 0x94c4c833, "RSP SW Version: 2.0D, 04-01-96" }, // Star Wars Shadows of Empire
{ F3DEX, true, 0x637b4b58, "RSP SW Version: 2.0D, 04-01-96" },
{ F3D, true, 0x54c558ba, "RSP SW Version: 2.0D, 04-01-96" }, // Pilot Wings
{ F3DGOLDEN, true, 0x302bca09, "RSP SW Version: 2.0G, 09-30-96" }, // GoldenEye
@ -180,8 +179,7 @@ void GBIInfo::_makeCurrent(MicrocodeInfo * _pCurrent)
case S2DEX2: S2DEX2_Init(); break;
case F3DDKR: F3DDKR_Init(); break;
case F3DJFG: F3DJFG_Init(); break;
case F3DSWSE: F3DSWSE_Init(); break;
case F3DWRUS: F3DWRUS_Init(); break;
case F3DBETA: F3DBETA_Init(); break;
case F3DPD: F3DPD_Init(); break;
case Turbo3D: F3D_Init(); break;
case ZSortp: ZSort_Init(); break;

9
src/GBI.h
View File

@ -17,15 +17,14 @@
#define F3DPD 8
#define F3DDKR 9
#define F3DJFG 10
#define F3DSWSE 11
#define F3DWRUS 12
#define F3DGOLDEN 11
#define F3DBETA 12
#define F3DEX2CBFD 13
#define Turbo3D 14
#define ZSortp 15
#define F3DSETA 16
#define F3DGOLDEN 17
#define F3DEX2MM 18
#define NONE 19
#define F3DEX2MM 17
#define NONE 18
// Fixed point conversion factors
#define FIXED2FLOATRECIP1 0.5f

3
src/mupen64plus-video-gliden64.mk
View File

@ -38,9 +38,8 @@ MY_LOCAL_SRC_FILES := \
$(SRCDIR)/F3DEX.cpp \
$(SRCDIR)/F3DPD.cpp \
$(SRCDIR)/F3DGOLDEN.cpp \
$(SRCDIR)/F3DSWSE.cpp \
$(SRCDIR)/F3DSETA.cpp \
$(SRCDIR)/F3DWRUS.cpp \
$(SRCDIR)/F3DBETA.cpp \
$(SRCDIR)/FBOTextureFormats.cpp \
$(SRCDIR)/FrameBuffer.cpp \
$(SRCDIR)/FrameBufferInfo.cpp \