ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bring more files in sync with mednafen

This commit is contained in:
zeromus 2020-04-09 16:08:37 -04:00
parent d8fad23324
commit 4818064bbb
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
psx/octoshock/psx/gpu_common.inc
View File

@ -78,7 +78,6 @@ GLBVAR(PhaseChange)
GLBVAR(InVBlank) GLBVAR(InVBlank)
GLBVAR(sl_zero_reached) GLBVAR(sl_zero_reached)
GLBVAR(skip) GLBVAR(skip)
GLBVAR(dump_framebuffer)
GLBVAR(field) GLBVAR(field)
GLBVAR(field_ram_readout) GLBVAR(field_ram_readout)
GLBVAR(DisplayFB_CurYOffset) GLBVAR(DisplayFB_CurYOffset)
@ -115,11 +114,11 @@ GLBVAR(GPURAM)
// //
// //
extern const CTEntry Commands_00_1F[0x20]; MDFN_HIDE extern const CTEntry Commands_00_1F[0x20];
extern const CTEntry Commands_20_3F[0x20]; MDFN_HIDE extern const CTEntry Commands_20_3F[0x20];
extern const CTEntry Commands_40_5F[0x20]; MDFN_HIDE extern const CTEntry Commands_40_5F[0x20];
extern const CTEntry Commands_60_7F[0x20]; MDFN_HIDE extern const CTEntry Commands_60_7F[0x20];
extern const CTEntry Commands_80_FF[0x80]; MDFN_HIDE extern const CTEntry Commands_80_FF[0x80];
template<int BlendMode, bool MaskEval_TA, bool textured> template<int BlendMode, bool MaskEval_TA, bool textured>

3
psx/octoshock/psx/gpu_line.cpp
View File

@ -21,7 +21,6 @@
#include "psx.h" #include "psx.h"
#include "gpu.h" #include "gpu.h"
#include "math_ops.h"
namespace MDFN_IEN_PSX namespace MDFN_IEN_PSX
{ {
@ -260,7 +259,7 @@ static void Command_DrawLine(const uint32 *cb)
DrawLine<goraud, BlendMode, MaskEval_TA>(points); DrawLine<goraud, BlendMode, MaskEval_TA>(points);
} }
extern const CTEntry Commands_40_5F[0x20] = MDFN_HIDE extern const CTEntry Commands_40_5F[0x20] =
{ {
LINE_HELPER(0x40), LINE_HELPER(0x40),
LINE_HELPER(0x41), LINE_HELPER(0x41),

3
psx/octoshock/psx/gpu_polygon.cpp
View File

@ -23,7 +23,6 @@
#include "psx.h" #include "psx.h"
#include "gpu.h" #include "gpu.h"
#include "math_ops.h"
namespace MDFN_IEN_PSX namespace MDFN_IEN_PSX
{ {
@ -595,7 +594,7 @@ static void Command_DrawPolygon(const uint32 *cb)
#undef COORD_FBS #undef COORD_FBS
#undef COORD_MF_INT #undef COORD_MF_INT
extern const CTEntry Commands_20_3F[0x20] = MDFN_HIDE extern const CTEntry Commands_20_3F[0x20] =
{ {
/* 0x20 */ /* 0x20 */
POLY_HELPER(0x20), POLY_HELPER(0x20),

3
psx/octoshock/psx/gpu_sprite.cpp
View File

@ -21,7 +21,6 @@
#include "psx.h" #include "psx.h"
#include "gpu.h" #include "gpu.h"
#include "math_ops.h"
namespace MDFN_IEN_PSX namespace MDFN_IEN_PSX
{ {
@ -235,7 +234,7 @@ static void Command_DrawSprite(const uint32 *cb)
} }
} }
extern const CTEntry Commands_60_7F[0x20] = MDFN_HIDE extern const CTEntry Commands_60_7F[0x20] =
{ {
SPR_HELPER(0x60), SPR_HELPER(0x60),
SPR_HELPER(0x61), SPR_HELPER(0x61),

2
psx/octoshock/psx/psx.h
View File

@ -27,7 +27,7 @@
#include "masmem.h" #include "masmem.h"
#include "endian.h" #include "endian.h"
#include "emuware/EW_state.h" #include "emuware/EW_state.h"
#include "math_ops.h"
// //
// Comment out these 2 defines for extra speeeeed. // Comment out these 2 defines for extra speeeeed.