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

Fix #include dependences.

Browse Source
This commit is contained in:
Sergey Lipskiy 2013-11-27 17:08:48 +07:00
parent cbaece1021
commit 32892a2236
11 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Debug.cpp
View File

@ -238,7 +238,7 @@ void EndDump()
fclose( dumpFile ); fclose( dumpFile );
} }
void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 ) void DebugRSPState( u32 pci, u32 pc, u32 cmd, u32 w0, u32 w1 )
{ {
Debug.rsp.pci = pci; Debug.rsp.pci = pci;
Debug.rsp.pc = pc; Debug.rsp.pc = pc;
@ -247,7 +247,7 @@ void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 )
Debug.rsp.w1 = w1; Debug.rsp.w1 = w1;
} }
void DebugMsg( WORD type, LPCSTR format, ... ) void DebugMsg( u16 type, const char * format, ... )
{ {
char text[256]; char text[256];

16
Debug.h
View File

@ -1,11 +1,7 @@
#if !defined( DEBUG_H ) && defined( _DEBUG ) #if !defined( DEBUG_H ) && defined( _DEBUG )
#define DEBUG_H #define DEBUG_H
#ifndef __LINUX__ #include "Types.h"
# include <windows.h>
#else
# include "winlnxdefs.h"
#endif
#include <stdio.h> #include <stdio.h>
#define DEBUG_LOW 0x1000 #define DEBUG_LOW 0x1000
@ -26,11 +22,11 @@
struct DebugInfo struct DebugInfo
{ {
WORD show, level; u16 show, level;
BOOL detail, paused, step; u8 detail, paused, step;
struct struct
{ {
DWORD pci, pc, cmd, w0, w1; u32 pci, pc, cmd, w0, w1;
} rsp; } rsp;
}; };
@ -38,8 +34,8 @@ extern DebugInfo Debug;
void OpenDebugDlg(); void OpenDebugDlg();
void CloseDebugDlg(); void CloseDebugDlg();
void DebugRSPState( DWORD pci, DWORD pc, DWORD cmd, DWORD w0, DWORD w1 ); void DebugRSPState( u32 pci, u32 pc, u32 cmd, u32 w0, u32 w1 );
void DebugMsg( WORD type, LPCSTR format, ... ); void DebugMsg( u16 type, const char * format, ... );
void StartDump( char *filename ); void StartDump( char *filename );
void EndDump(); void EndDump();

1
DepthBuffer.h
View File

@ -2,6 +2,7 @@
#define DEPTHBUFFER_H #define DEPTHBUFFER_H
#include "Types.h" #include "Types.h"
#include "Textures.h"
struct DepthBuffer struct DepthBuffer
{ {

1
FrameBuffer.cpp
View File

@ -7,6 +7,7 @@
#include "OpenGL.h" #include "OpenGL.h"
#include "FrameBuffer.h" #include "FrameBuffer.h"
#include "DepthBuffer.h" #include "DepthBuffer.h"
#include "N64.h"
#include "RSP.h" #include "RSP.h"
#include "RDP.h" #include "RDP.h"
#include "gDP.h" #include "gDP.h"

1
GBI.cpp
View File

@ -1,6 +1,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "convert.h" #include "convert.h"
#include "N64.h"
#include "GLideN64.h" #include "GLideN64.h"
#include "GBI.h" #include "GBI.h"
#include "RDP.h" #include "RDP.h"

1
GLSLCombiner.cpp
View File

@ -15,6 +15,7 @@
#include "GLSLCombiner.h" #include "GLSLCombiner.h"
#include "Shaders.h" #include "Shaders.h"
#include "Noise_shader.h" #include "Noise_shader.h"
#include "FrameBuffer.h"
#include "DepthBuffer.h" #include "DepthBuffer.h"
static GLuint g_vertex_shader_object; static GLuint g_vertex_shader_object;

1
OpenGL.cpp
View File

@ -9,6 +9,7 @@
#include "gDP.h" #include "gDP.h"
#include "Textures.h" #include "Textures.h"
#include "Combiner.h" #include "Combiner.h"
#include "FrameBuffer.h"
#include "VI.h" #include "VI.h"
GLInfo OGL; GLInfo OGL;

1
RDP.cpp
View File

@ -2,7 +2,6 @@
#include "RSP.h" #include "RSP.h"
#include "GBI.h" #include "GBI.h"
#include "gDP.h" #include "gDP.h"
#include "Types.h"
#include "Debug.h" #include "Debug.h"
void RDP_Unknown( u32 w0, u32 w1 ) void RDP_Unknown( u32 w0, u32 w1 )

10
RSP.h
View File

@ -1,16 +1,6 @@
#ifndef RSP_H #ifndef RSP_H
#define RSP_H #define RSP_H
#ifndef __LINUX__
#include <windows.h>
#else
#include "winlnxdefs.h"
#include <SDL/SDL.h>
#include <SDL/SDL_thread.h>
#endif
#include "N64.h"
#include "GBI.h"
#include "gSP.h"
#include "Types.h" #include "Types.h"
typedef struct typedef struct

2
gDP.h
View File

@ -2,7 +2,6 @@
#define GDP_H #define GDP_H
#include "Types.h" #include "Types.h"
#include "FrameBuffer.h"
#define CHANGED_RENDERMODE 0x001 #define CHANGED_RENDERMODE 0x001
#define CHANGED_CYCLETYPE 0x002 #define CHANGED_CYCLETYPE 0x002
@ -59,6 +58,7 @@ struct gDPCombine
}; };
}; };
struct FrameBuffer;
struct gDPTile struct gDPTile
{ {
u32 format, size, line, tmem, palette; u32 format, size, line, tmem, palette;

2
gSP.cpp
View File

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "N64.h"
#include "GLideN64.h" #include "GLideN64.h"
#include "Debug.h" #include "Debug.h"
#include "Types.h" #include "Types.h"
@ -14,6 +15,7 @@
#include "convert.h" #include "convert.h"
#include "S2DEX.h" #include "S2DEX.h"
#include "VI.h" #include "VI.h"
#include "FrameBuffer.h"
#include "DepthBuffer.h" #include "DepthBuffer.h"
#ifndef __LINUX__ #ifndef __LINUX__
# include "Resource.h" # include "Resource.h"