d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppu: rename draw → drawppu to avoid conflicts on Plan 9

This commit is contained in:
Sigrid Solveig Haflínudóttir 2021-04-22 18:04:06 +00:00
parent 3dbe34ecaa
commit 9c3536bca8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emulator.c
View File

@ -49,7 +49,7 @@ audio_callback(void *u, Uint8 *stream, int len)
void void
redraw(Uint32 *dst, Uxn *u) redraw(Uint32 *dst, Uxn *u)
{ {
draw(&ppu); drawppu(&ppu);
if(debug) if(debug)
drawdebugger(&ppu, u->wst.dat, u->wst.ptr); drawdebugger(&ppu, u->wst.dat, u->wst.ptr);
SDL_UpdateTexture(gTexture, NULL, dst, ppu.width * sizeof(Uint32)); SDL_UpdateTexture(gTexture, NULL, dst, ppu.width * sizeof(Uint32));

4
src/ppu.c
View File

@ -126,7 +126,7 @@ drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr)
} }
void void
draw(Ppu *p) drawppu(Ppu *p)
{ {
Uint16 x, y; Uint16 x, y;
for(y = 0; y < p->ver; ++y) for(y = 0; y < p->ver; ++y)
@ -164,4 +164,4 @@ initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad)
return 0; return 0;
clear(p); clear(p);
return 1; return 1;
} }

4
src/ppu.h
View File

@ -28,5 +28,5 @@ void putcolors(Ppu *p, Uint8 *addr);
void putpixel(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 color); void putpixel(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 color);
void puticn(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color); void puticn(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color);
void putchr(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color); void putchr(Ppu *p, Uint8 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color);
void draw(Ppu *p); void drawppu(Ppu *p);
void drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr); void drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr);