ecker/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'full_naomi_compat' into 'master'

Browse Source 
Change all ifdefs to support both DC & Naomi

See merge request simulant/GLdc!154
This commit is contained in:
Luke Benstead 2025-03-01 19:27:12 +00:00
commit 8d6435d9dc
40 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/matrix.c
View File

@ -181,7 +181,7 @@ void APIENTRY glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) {
0.0f, 0.0f, 0.0f, 1.0f 0.0f, 0.0f, 0.0f, 1.0f
}; };
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
float s, c; float s, c;
fsincos(angle, &s, &c); fsincos(angle, &s, &c);
#else #else

2
GL/platform.h
View File

@ -445,7 +445,7 @@ static inline void CompilePolyHeader(PolyHeader *dst, const PolyContext *src) {
dst->d3 = dst->d4 = 0xffffffff; dst->d3 = dst->d4 = 0xffffffff;
} }
#if defined(__DREAMCAST__) || defined(__NAOMI__) #ifdef _arch_dreamcast
#include "platforms/sh4.h" #include "platforms/sh4.h"
#else #else
#include "platforms/software.h" #include "platforms/software.h"

4
GL/private.h
View File

@ -224,7 +224,7 @@ GL_FORCE_INLINE float clamp(float d, float min, float max) {
} }
GL_FORCE_INLINE void memcpy_vertex(Vertex *dest, const Vertex *src) { GL_FORCE_INLINE void memcpy_vertex(Vertex *dest, const Vertex *src) {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
_Complex float double_scratch; _Complex float double_scratch;
asm volatile ( asm volatile (
@ -260,7 +260,7 @@ do { \
memcpy_vertex(b, &c); \ memcpy_vertex(b, &c); \
} while(0) } while(0)
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#define fast_rsqrt(x) frsqrt(x) #define fast_rsqrt(x) frsqrt(x)
#else #else
#define fast_rsqrt(x) (1.0f / __builtin_sqrtf(x)) #define fast_rsqrt(x) (1.0f / __builtin_sqrtf(x))

2
GL/texture.c
View File

@ -538,7 +538,7 @@ GLubyte _glInitTextures() {
ALLOC_SIZE = vram_free - PVR_MEM_BUFFER_SIZE; /* Take all but 64kb VRAM */ ALLOC_SIZE = vram_free - PVR_MEM_BUFFER_SIZE; /* Take all but 64kb VRAM */
ALLOC_BASE = GPUMemoryAlloc(ALLOC_SIZE); ALLOC_BASE = GPUMemoryAlloc(ALLOC_SIZE);
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
/* Ensure memory is aligned */ /* Ensure memory is aligned */
gl_assert((uintptr_t) ALLOC_BASE % 32 == 0); gl_assert((uintptr_t) ALLOC_BASE % 32 == 0);
#endif #endif

2
containers/aligned_vector.h
View File

@ -30,7 +30,7 @@ static inline void* memalign(size_t alignment, size_t size) {
#define AV_NO_INLINE __attribute__((noinline)) #define AV_NO_INLINE __attribute__((noinline))
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
AV_FORCE_INLINE void *AV_MEMCPY4(void *dest, const void *src, size_t len) AV_FORCE_INLINE void *AV_MEMCPY4(void *dest, const void *src, size_t len)
{ {

4
samples/blend_test/main.c
View File

@ -5,7 +5,7 @@
* and with adapted/corrected explanation * and with adapted/corrected explanation
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -48,7 +48,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

14
samples/cubes/main.cpp
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
float avgfps = -1; float avgfps = -1;
#endif #endif
@ -123,7 +123,7 @@ float lutScaleFactors[MAX_CUBES];
void debugLog(const char* msg) void debugLog(const char* msg)
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
dbglog(DBG_KDEBUG, "%s\n", msg); dbglog(DBG_KDEBUG, "%s\n", msg);
#else #else
printf("%s\n", msg); printf("%s\n", msg);
@ -133,7 +133,7 @@ void debugLog(const char* msg)
void runningStats() void runningStats()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -147,7 +147,7 @@ void runningStats()
void avgStats() void avgStats()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
dbglog(DBG_DEBUG, "Average frame rate: ~%f fps\n", avgfps); dbglog(DBG_DEBUG, "Average frame rate: ~%f fps\n", avgfps);
#endif #endif
} }
@ -155,7 +155,7 @@ void avgStats()
void stats() void stats()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -345,7 +345,7 @@ void updateLogic()
void updateInput() void updateInput()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
static uint8_t prevButtons = 0; static uint8_t prevButtons = 0;
maple_device_t* cont; maple_device_t* cont;
cont_state_t* state; cont_state_t* state;
@ -383,7 +383,7 @@ void updateInput()
void swapBuffers() void swapBuffers()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
glKosSwapBuffers(); glKosSwapBuffers();
#endif #endif
} }

4
samples/depth_funcs/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/depth_funcs_alpha_testing/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -9,7 +9,7 @@
//$KOS_BASE/utils/texconv/texconv --in disk.png --format ARGB4444 --preview disk_preview.png --out disk.dtex //$KOS_BASE/utils/texconv/texconv --in disk.png --format ARGB4444 --preview disk_preview.png --out disk.dtex
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMAGE_FILENAME "/rd/disk_1555.dtex" #define IMAGE_FILENAME "/rd/disk_1555.dtex"
@ -105,7 +105,7 @@ void DrawGLScene()
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/depth_funcs_ortho/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -53,7 +53,7 @@ void DrawSquare(float width, float r, float g, float b, float z) {
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/lerabot01/main.c
View File

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -12,7 +12,7 @@
#include "GL/glu.h" #include "GL/glu.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMAGE_FILENAME "/rd/flag1.bmp" #define IMAGE_FILENAME "/rd/flag1.bmp"
@ -120,7 +120,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/lights/main.c
View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -12,7 +12,7 @@
#include "GL/glext.h" #include "GL/glext.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
@ -125,7 +125,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/mipmap/main.c
View File

@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -11,7 +11,7 @@
#include "GL/glext.h" #include "GL/glext.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMAGE_FILENAME "/rd/NeHe.bmp" #define IMAGE_FILENAME "/rd/NeHe.bmp"
@ -87,7 +87,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/multitexture_arrays/main.c
View File

@ -11,7 +11,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -20,7 +20,7 @@
#include "GL/glkos.h" #include "GL/glkos.h"
#include "GL/glext.h" #include "GL/glext.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMAGE1_FILENAME "/rd/wp001vq.pvr" #define IMAGE1_FILENAME "/rd/wp001vq.pvr"
@ -48,7 +48,7 @@ GLfloat TEXCOORD_ARRAY[4 * 2] = { 0, 0,
GLuint ARGB_ARRAY[4] = { 0xFFFF0000, 0xFF0000FF, 0xFF00FF00, 0xFFFFFF00 }; GLuint ARGB_ARRAY[4] = { 0xFFFF0000, 0xFF0000FF, 0xFF00FF00, 0xFFFFFF00 };
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe02/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe02de/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -41,7 +41,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe02va/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -41,7 +41,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe03/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -39,7 +39,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe04/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -42,7 +42,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/nehe05/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -42,7 +42,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/nehe06/main.c
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -12,7 +12,7 @@
#include "GL/glext.h" #include "GL/glext.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMAGE_FILENAME "/rd/NeHe.bmp" #define IMAGE_FILENAME "/rd/NeHe.bmp"
@ -96,7 +96,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/nehe06_4444twid/main.c
View File

@ -2,7 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -11,7 +11,7 @@
#include "GL/glkos.h" #include "GL/glkos.h"
#include "GL/glext.h" #include "GL/glext.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_PATH "/rd/NeHe.tex" #define IMG_PATH "/rd/NeHe.tex"
@ -199,7 +199,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/nehe06_vq/main.c
View File

@ -1,7 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -10,7 +10,7 @@
#include "GL/glkos.h" #include "GL/glkos.h"
#include "GL/glext.h" #include "GL/glext.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_PATH "/rd/NeHe.tex" #define IMG_PATH "/rd/NeHe.tex"
@ -215,7 +215,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/nehe08/main.c
View File

@ -8,7 +8,7 @@
(c)2000 Jeff Molofee (c)2000 Jeff Molofee
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
#include <GL/gl.h> #include <GL/gl.h>
@ -26,7 +26,7 @@
blending. blending.
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_PATH "/rd/glass.pvr" #define IMG_PATH "/rd/glass.pvr"
@ -163,7 +163,7 @@ void DrawGLScene(void) {
} }
int ReadController(void) { int ReadController(void) {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

8
samples/nehe10/main.c
View File

@ -8,7 +8,7 @@
(c)2000 Jeff Molofee (c)2000 Jeff Molofee
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#else #else
#include <SDL.h> #include <SDL.h>
@ -25,7 +25,7 @@
#include "../loadbmp.h" #include "../loadbmp.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_PATH "/rd/brick.bmp" #define IMG_PATH "/rd/brick.bmp"
@ -88,7 +88,7 @@ void SetupWorld()
int numtriangles; int numtriangles;
FILE *filein; FILE *filein;
char oneline[255]; char oneline[255];
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
filein = fopen("/rd/world.txt", "rt"); // File To Load World Data From filein = fopen("/rd/world.txt", "rt"); // File To Load World Data From
#else #else
filein = fopen("../samples/nehe10/romdisk/world.txt", "rt"); filein = fopen("../samples/nehe10/romdisk/world.txt", "rt");
@ -248,7 +248,7 @@ int ReadController(void) {
bool right = false; bool right = false;
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

10
samples/nehe20/main.c
View File

@ -12,7 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -21,7 +21,7 @@ uint32_t waittime = 1000.0f/FPS;
uint32_t framestarttime = 0; uint32_t framestarttime = 0;
int32_t delaytime; int32_t delaytime;
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_LOGO_PATH "/rd/logo.bmp" #define IMG_LOGO_PATH "/rd/logo.bmp"
@ -57,7 +57,7 @@ KOS_INIT_ROMDISK(romdisk);
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
#include <OpenGL/gl.h> // Header File For The OpenGL32 Library #include <OpenGL/gl.h> // Header File For The OpenGL32 Library
#include <OpenGL/glu.h> // Header File For The GLu32 Library #include <OpenGL/glu.h> // Header File For The GLu32 Library
#elif defined(__DREAMCAST__) #elif defined(_arch_dreamcast)
#include <kos.h> #include <kos.h>
#include <GL/gl.h> // Header File For The OpenGL32 Library #include <GL/gl.h> // Header File For The OpenGL32 Library
#include <GL/glu.h> // Header File For The GLu32 Library #include <GL/glu.h> // Header File For The GLu32 Library
@ -238,7 +238,7 @@ int main(int argc, char *argv[])
InitGL(); InitGL();
ReSizeGLScene(640, 480); ReSizeGLScene(640, 480);
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t* cont = maple_enum_type(0, MAPLE_FUNC_CONTROLLER); maple_device_t* cont = maple_enum_type(0, MAPLE_FUNC_CONTROLLER);
assert(cont); assert(cont);
#endif #endif
@ -246,7 +246,7 @@ int main(int argc, char *argv[])
while(1) { while(1) {
DrawGLScene(); DrawGLScene();
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
cont_state_t* state = (cont_state_t *)maple_dev_status(cont); cont_state_t* state = (cont_state_t *)maple_dev_status(cont);
if((state->buttons & CONT_A) && !sp) { if((state->buttons & CONT_A) && !sp) {

4
samples/ortho2d/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -40,7 +40,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/paletted/main.c
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -12,7 +12,7 @@
#include "GL/glu.h" #include "GL/glu.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
extern uint8_t romdisk[]; extern uint8_t romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
#define IMG_PATH "/rd/NeHe.tex" #define IMG_PATH "/rd/NeHe.tex"
@ -172,7 +172,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/paletted_pcx/main.c
View File

@ -4,7 +4,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -16,7 +16,7 @@
/* using 4bpp textures from BMP files instead of 8bpp from PCX files */ /* using 4bpp textures from BMP files instead of 8bpp from PCX files */
#define USE_16C_PALETTE #define USE_16C_PALETTE
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
@ -507,7 +507,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/polygon_offset/main.c
View File

@ -4,7 +4,7 @@ typedef enum
true true
} bool; } bool;
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -100,7 +100,7 @@ void drawPolygon()
int frames = 0; int frames = 0;
int check_input() int check_input()
{ {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

8
samples/polymark/main.c
View File

@ -7,7 +7,7 @@
(c)2002 Dan Potter, Paul Boese (c)2002 Dan Potter, Paul Boese
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -24,7 +24,7 @@ int phase = PHASE_HALVE;
float avgfps = -1; float avgfps = -1;
void running_stats() { void running_stats() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -36,7 +36,7 @@ void running_stats() {
} }
void stats() { void stats() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -47,7 +47,7 @@ void stats() {
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/primitive_modes/main.c
View File

@ -3,7 +3,7 @@
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef __DREAMCAST__ #ifndef _arch_dreamcast
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
static SDL_Window* win_handle; static SDL_Window* win_handle;
#else #else
@ -119,7 +119,7 @@ static void DrawTriFan(float y) {
} }
static void sample_init() { static void sample_init() {
#ifndef __DREAMCAST__ #ifndef _arch_dreamcast
SDL_Init(SDL_INIT_EVERYTHING); SDL_Init(SDL_INIT_EVERYTHING);
win_handle = SDL_CreateWindow("Shapes", 0, 0, 640, 480, SDL_WINDOW_OPENGL); win_handle = SDL_CreateWindow("Shapes", 0, 0, 640, 480, SDL_WINDOW_OPENGL);
SDL_GL_CreateContext(win_handle); SDL_GL_CreateContext(win_handle);
@ -129,7 +129,7 @@ static void sample_init() {
} }
static int sample_should_exit() { static int sample_should_exit() {
#ifndef __DREAMCAST__ #ifndef _arch_dreamcast
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if(event.type == SDL_QUIT) return 1; if(event.type == SDL_QUIT) return 1;

6
samples/prof_texture_upload/main.c
View File

@ -2,7 +2,7 @@
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#include "../profiler.h" #include "../profiler.h"
#endif #endif
@ -35,7 +35,7 @@ int main(int argc, char* argv[]) {
fprintf(stderr, "Starting test run...\n"); fprintf(stderr, "Starting test run...\n");
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#if PROFILE #if PROFILE
profiler_init("/pc/gmon.out"); profiler_init("/pc/gmon.out");
profiler_start(); profiler_start();
@ -51,7 +51,7 @@ int main(int argc, char* argv[]) {
end = time(NULL); end = time(NULL);
} }
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#if PROFILE #if PROFILE
profiler_stop(); profiler_stop();
profiler_clean_up(); profiler_clean_up();

8
samples/quadmark/main.c
View File

@ -7,7 +7,7 @@
(c)2002 Dan Potter, Paul Boese (c)2002 Dan Potter, Paul Boese
*/ */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#include "../profiler.h" #include "../profiler.h"
#endif #endif
@ -27,7 +27,7 @@ int phase = PHASE_HALVE;
float avgfps = -1; float avgfps = -1;
void running_stats() { void running_stats() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -39,7 +39,7 @@ void running_stats() {
} }
void stats() { void stats() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
pvr_stats_t stats; pvr_stats_t stats;
pvr_get_stats(&stats); pvr_get_stats(&stats);
@ -50,7 +50,7 @@ void stats() {
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/scissor/main.c
View File

@ -1,4 +1,4 @@
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -43,7 +43,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/terrain/main.c
View File

@ -1,7 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -96,7 +96,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/zclip/main.c
View File

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -12,7 +12,7 @@
#include "GL/glext.h" #include "GL/glext.h"
#include "GL/glkos.h" #include "GL/glkos.h"
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
extern uint8 romdisk[]; extern uint8 romdisk[];
KOS_INIT_ROMDISK(romdisk); KOS_INIT_ROMDISK(romdisk);
@ -187,7 +187,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

4
samples/zclip_triangle/main.c
View File

@ -2,7 +2,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -48,7 +48,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

6
samples/zclip_trianglestrip/main.c
View File

@ -2,7 +2,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
#include <kos.h> #include <kos.h>
#endif #endif
@ -47,7 +47,7 @@ void ReSizeGLScene(int Width, int Height)
} }
int check_start() { int check_start() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;
@ -68,7 +68,7 @@ static GLfloat movement = -10.0f;
static GLfloat rotation = 0.0f; static GLfloat rotation = 0.0f;
void update_movement() { void update_movement() {
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
maple_device_t *cont; maple_device_t *cont;
cont_state_t *state; cont_state_t *state;

2
tests/zclip/main.cpp
View File

@ -122,7 +122,7 @@ void memcpy_vertex(Vertex* dst, Vertex* src) {
/* Zclipping is so difficult to get right, that self sample tests all the cases of clipping and makes sure that things work as expected */ /* Zclipping is so difficult to get right, that self sample tests all the cases of clipping and makes sure that things work as expected */
#ifdef __DREAMCAST__ #ifdef _arch_dreamcast
static volatile int *pvrdmacfg = (int*)0xA05F6888; static volatile int *pvrdmacfg = (int*)0xA05F6888;
static volatile int *qacr = (int*)0xFF000038; static volatile int *qacr = (int*)0xFF000038;
#else #else