Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-22 10:22:48 +01:00
Code Issues Projects Releases Wiki Activity

- [Psy-X] move some declarations to resolve conflicts

Browse Source
This commit is contained in:
Ilya Shurumov 2021-04-30 02:08:48 +06:00
parent fdb5aeacb3
commit 1ef19ddb70
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src_rebuild/PsyX/include/PSYX_GLOBALS.H
View File

@ -1,11 +1,6 @@
#ifndef EMULATOR_GLOBALS_H #ifndef EMULATOR_GLOBALS_H
#define EMULATOR_GLOBALS_H #define EMULATOR_GLOBALS_H
#include "PSYX_RENDER.H"
extern TextureID g_whiteTexture;
extern TextureID g_vramTexture;
extern int g_windowWidth; extern int g_windowWidth;
extern int g_windowHeight; extern int g_windowHeight;
extern int g_wireframeMode; extern int g_wireframeMode;

5
src_rebuild/PsyX/include/PSYX_RENDER.H
View File

@ -152,7 +152,10 @@ typedef uint ShaderID;
#error #error
#endif #endif
extern void GR_SwapWindow(); extern TextureID g_whiteTexture;
extern TextureID g_vramTexture;
extern void GR_SwapWindow();
// PSX VRAM operations // PSX VRAM operations
extern void GR_SaveVRAM(const char* outputFileName, int x, int y, int width, int height, int bReadFromFrameBuffer); extern void GR_SaveVRAM(const char* outputFileName, int x, int y, int width, int height, int bReadFromFrameBuffer);

1
src_rebuild/PsyX/src/GPU/PsyX_GPU.C
View File

@ -2,6 +2,7 @@
#include "PSYX_PUBLIC.H" #include "PSYX_PUBLIC.H"
#include "PSYX_GLOBALS.H" #include "PSYX_GLOBALS.H"
#include "PSYX_RENDER.H"
#include "../PSYX_SETUP.H" #include "../PSYX_SETUP.H"

1
src_rebuild/PsyX/src/PSYX.C
View File

@ -7,6 +7,7 @@
#include "UTIL/CRASHHANDLER.H" #include "UTIL/CRASHHANDLER.H"
#include "LIBETC.H" #include "LIBETC.H"
#include "LIBGTE.H"
#include "LIBGPU.H" #include "LIBGPU.H"
#include "UTIL/TIMER.H" #include "UTIL/TIMER.H"