notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
win32 Pico mostly finished
[picodrive.git]
/
Pico
/
Draw2.c
diff --git
a/Pico/Draw2.c
b/Pico/Draw2.c
index
2484164
..
ec82e44
100644
(file)
--- a/
Pico/Draw2.c
+++ b/
Pico/Draw2.c
@@
-10,10
+10,6
@@
\r
\r
#include "PicoInt.h"
\r
\r
\r
#include "PicoInt.h"
\r
-#include <assert.h>
\r
-#ifndef __GNUC__
\r
-#pragma warning (disable:4706) // Disable assignment within conditional
\r
-#endif
\r
\r
// port_config.h include must define these 2 defines:
\r
// #define START_ROW 1 // which row of tiles to start rendering at?
\r
\r
// port_config.h include must define these 2 defines:
\r
// #define START_ROW 1 // which row of tiles to start rendering at?
\r
@@
-24,12
+20,17
@@
\r
#define USE_CACHE
\r
\r
\r
#define USE_CACHE
\r
\r
+// note: this is not implemented in ARM asm
\r
+#if defined(DRAW2_OVERRIDE_LINE_WIDTH)
\r
+#define LINE_WIDTH DRAW2_OVERRIDE_LINE_WIDTH
\r
+#else
\r
+#define LINE_WIDTH 328
\r
+#endif
\r
\r
\r
-extern unsigned char *framebuff; // in format (8+320)x(8+224+8) (eights for borders)
\r
int currpri = 0;
\r
\r
int currpri = 0;
\r
\r
-static int HighCacheA[41*(TILE_ROWS+1)+1+1]; // caches for high layers
\r
-static int HighCacheB[41*(TILE_ROWS+1)+1+1];
\r
+static int HighCache
2
A[41*(TILE_ROWS+1)+1+1]; // caches for high layers
\r
+static int HighCache
2
B[41*(TILE_ROWS+1)+1+1];
\r
\r
unsigned short *PicoCramHigh=Pico.cram; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)
\r
void (*PicoPrepareCram)()=0; // prepares PicoCramHigh for renderer to use
\r
\r
unsigned short *PicoCramHigh=Pico.cram; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)
\r
void (*PicoPrepareCram)()=0; // prepares PicoCramHigh for renderer to use
\r
@@
-50,7
+51,7
@@
static int TileXnormYnorm(unsigned char *pd,int addr,unsigned char pal)
unsigned int pack=0; unsigned int t=0, blank = 1;
\r
int i;
\r
\r
unsigned int pack=0; unsigned int t=0, blank = 1;
\r
int i;
\r
\r
- for(i=8; i; i--, addr+=2, pd +=
320+8
) {
\r
+ for(i=8; i; i--, addr+=2, pd +=
LINE_WIDTH
) {
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
@@
-73,7
+74,7
@@
static int TileXflipYnorm(unsigned char *pd,int addr,unsigned char pal)
unsigned int pack=0; unsigned int t=0, blank = 1;
\r
int i;
\r
\r
unsigned int pack=0; unsigned int t=0, blank = 1;
\r
int i;
\r
\r
- for(i=8; i; i--, addr+=2, pd +=
320+8
) {
\r
+ for(i=8; i; i--, addr+=2, pd +=
LINE_WIDTH
) {
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
@@
-96,7
+97,7
@@
static int TileXnormYflip(unsigned char *pd,int addr,unsigned char pal)
int i;
\r
\r
addr+=14;
\r
int i;
\r
\r
addr+=14;
\r
- for(i=8; i; i--, addr-=2, pd +=
320+8
) {
\r
+ for(i=8; i; i--, addr-=2, pd +=
LINE_WIDTH
) {
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
@@
-120,7
+121,7
@@
static int TileXflipYflip(unsigned char *pd,int addr,unsigned char pal)
int i;
\r
\r
addr+=14;
\r
int i;
\r
\r
addr+=14;
\r
- for(i=8; i; i--, addr-=2, pd +=
320+8
) {
\r
+ for(i=8; i; i--, addr-=2, pd +=
LINE_WIDTH
) {
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
pack=*(unsigned int *)(Pico.vram+addr); // Get 8 pixels
\r
if(!pack) continue;
\r
\r
@@
-143,7
+144,7
@@
static void DrawWindowFull(int start, int end, int prio)
{
\r
struct PicoVideo *pvid=&Pico.video;
\r
int nametab, nametab_step, trow, tilex, blank=-1, code;
\r
{
\r
struct PicoVideo *pvid=&Pico.video;
\r
int nametab, nametab_step, trow, tilex, blank=-1, code;
\r
- unsigned char *scrpos =
framebuff
;
\r
+ unsigned char *scrpos =
PicoDraw2FB
;
\r
int tile_start, tile_end; // in cells
\r
\r
// parse ranges
\r
int tile_start, tile_end; // in cells
\r
\r
// parse ranges
\r
@@
-169,8
+170,8
@@
static void DrawWindowFull(int start, int end, int prio)
code=Pico.vram[nametab+tile_start];
\r
if ((code>>15) != prio) return; // hack: just assume that whole window uses same priority
\r
\r
code=Pico.vram[nametab+tile_start];
\r
if ((code>>15) != prio) return; // hack: just assume that whole window uses same priority
\r
\r
- scrpos+=8*
328
+8;
\r
- scrpos+=8*
328
*(start-START_ROW);
\r
+ scrpos+=8*
LINE_WIDTH
+8;
\r
+ scrpos+=8*
LINE_WIDTH
*(start-START_ROW);
\r
\r
// do a window until we reach planestart row
\r
for(trow = start; trow < end; trow++, nametab+=nametab_step) { // current tile row
\r
\r
// do a window until we reach planestart row
\r
for(trow = start; trow < end; trow++, nametab+=nametab_step) { // current tile row
\r
@@
-198,7
+199,7
@@
static void DrawWindowFull(int start, int end, int prio)
if(zero) blank=code; // We know this tile is blank now
\r
}
\r
\r
if(zero) blank=code; // We know this tile is blank now
\r
}
\r
\r
- scrpos +=
328
*8;
\r
+ scrpos +=
LINE_WIDTH
*8;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-235,20
+236,20
@@
static void DrawLayerFull(int plane, int *hcache, int planestart, int planeend)
height=(width>>4)&3; width&=3;
\r
\r
xmask=(1<<shift[width ])-1; // X Mask in tiles
\r
height=(width>>4)&3; width&=3;
\r
\r
xmask=(1<<shift[width ])-1; // X Mask in tiles
\r
- ymask=(height<<5)|0x1f; // Y Mask in tiles
\r
- if(width == 1) ymask&=0x3f;
\r
- else if(width>1) ymask =0x1f;
\r
+
ymask=(height<<5)|0x1f; // Y Mask in tiles
\r
+
if(width == 1) ymask&=0x3f;
\r
+
else if(width>1) ymask =0x1f;
\r
\r
// Find name table:
\r
if (plane==0) nametab=(pvid->reg[2]&0x38)<< 9; // A
\r
else nametab=(pvid->reg[4]&0x07)<<12; // B
\r
\r
\r
// Find name table:
\r
if (plane==0) nametab=(pvid->reg[2]&0x38)<< 9; // A
\r
else nametab=(pvid->reg[4]&0x07)<<12; // B
\r
\r
- scrpos =
framebuff
;
\r
- scrpos+=8*
328
*(planestart-START_ROW);
\r
+ scrpos =
PicoDraw2FB
;
\r
+ scrpos+=8*
LINE_WIDTH
*(planestart-START_ROW);
\r
\r
// Get vertical scroll value:
\r
vscroll=Pico.vsram[plane]&0x1ff;
\r
\r
// Get vertical scroll value:
\r
vscroll=Pico.vsram[plane]&0x1ff;
\r
- scrpos+=(8-(vscroll&7))*
328
;
\r
+ scrpos+=(8-(vscroll&7))*
LINE_WIDTH
;
\r
if(vscroll&7) planeend++; // we have vertically clipped tiles due to vscroll, so we need 1 more row
\r
\r
*hcache++ = 8-(vscroll&7); // push y-offset to tilecache
\r
if(vscroll&7) planeend++; // we have vertically clipped tiles due to vscroll, so we need 1 more row
\r
\r
*hcache++ = 8-(vscroll&7); // push y-offset to tilecache
\r
@@
-307,7
+308,7
@@
static void DrawLayerFull(int plane, int *hcache, int planestart, int planeend)
if(zero) blank=code; // We know this tile is blank now
\r
}
\r
\r
if(zero) blank=code; // We know this tile is blank now
\r
}
\r
\r
- scrpos +=
328
*8;
\r
+ scrpos +=
LINE_WIDTH
*8;
\r
}
\r
\r
*hcache = 0; // terminate cache
\r
}
\r
\r
*hcache = 0; // terminate cache
\r
@@
-321,10
+322,10
@@
static void DrawTilesFromCacheF(int *hc)
// unsigned short *pal;
\r
unsigned char pal;
\r
short blank=-1; // The tile we know is blank
\r
// unsigned short *pal;
\r
unsigned char pal;
\r
short blank=-1; // The tile we know is blank
\r
- unsigned char *scrpos =
framebuff
, *pd = 0;
\r
+ unsigned char *scrpos =
PicoDraw2FB
, *pd = 0;
\r
\r
// *hcache++ = code|(dx<<16)|(trow<<27); // cache it
\r
\r
// *hcache++ = code|(dx<<16)|(trow<<27); // cache it
\r
- scrpos+=(*hc++)*
328 - START_ROW*328
*8;
\r
+ scrpos+=(*hc++)*
LINE_WIDTH - START_ROW*LINE_WIDTH
*8;
\r
\r
while((code=*hc++)) {
\r
if((short)code == blank) continue;
\r
\r
while((code=*hc++)) {
\r
if((short)code == blank) continue;
\r
@@
-332,7
+333,7
@@
static void DrawTilesFromCacheF(int *hc)
// y pos
\r
if(((unsigned)code>>27) != prevy) {
\r
prevy = (unsigned)code>>27;
\r
// y pos
\r
if(((unsigned)code>>27) != prevy) {
\r
prevy = (unsigned)code>>27;
\r
- pd = scrpos + prevy*
328
*8;
\r
+ pd = scrpos + prevy*
LINE_WIDTH
*8;
\r
}
\r
\r
// Get tile address/2:
\r
}
\r
\r
// Get tile address/2:
\r
@@
-384,8
+385,8
@@
static void DrawSpriteFull(unsigned int *sprite)
// goto first vertically visible tile
\r
while(sy <= START_ROW*8) { sy+=8; tile+=tdeltay; height--; }
\r
\r
// goto first vertically visible tile
\r
while(sy <= START_ROW*8) { sy+=8; tile+=tdeltay; height--; }
\r
\r
- scrpos =
framebuff
;
\r
- scrpos+=(sy-START_ROW*8)*
328
;
\r
+ scrpos =
PicoDraw2FB
;
\r
+ scrpos+=(sy-START_ROW*8)*
LINE_WIDTH
;
\r
\r
for (; height > 0; height--, sy+=8, tile+=tdeltay)
\r
{
\r
\r
for (; height > 0; height--, sy+=8, tile+=tdeltay)
\r
{
\r
@@
-407,7
+408,7
@@
static void DrawSpriteFull(unsigned int *sprite)
}
\r
}
\r
\r
}
\r
}
\r
\r
- scrpos+=8*
328
;
\r
+ scrpos+=8*
LINE_WIDTH
;
\r
}
\r
}
\r
#endif
\r
}
\r
}
\r
#endif
\r
@@
-484,8
+485,7
@@
static void DrawAllSpritesFull(int prio, int maxwidth)
#ifndef _ASM_DRAW_C
\r
static void BackFillFull(int reg7)
\r
{
\r
#ifndef _ASM_DRAW_C
\r
static void BackFillFull(int reg7)
\r
{
\r
- unsigned int back, i;
\r
- unsigned int *p=(unsigned int *)framebuff;
\r
+ unsigned int back;
\r
\r
// Start with a background color:
\r
// back=PicoCramHigh[reg7&0x3f];
\r
\r
// Start with a background color:
\r
// back=PicoCramHigh[reg7&0x3f];
\r
@@
-493,12
+493,7
@@
static void BackFillFull(int reg7)
back|=back<<8;
\r
back|=back<<16;
\r
\r
back|=back<<8;
\r
back|=back<<16;
\r
\r
- for(i = (8+320)*(8+(END_ROW-START_ROW)*8)/16; i; i--) {
\r
- *p++ = back; // do 16 pixels per iteration
\r
- *p++ = back;
\r
- *p++ = back;
\r
- *p++ = back;
\r
- }
\r
+ memset32((int *)PicoDraw2FB, back, LINE_WIDTH*(8+(END_ROW-START_ROW)*8)/4);
\r
}
\r
#endif
\r
\r
}
\r
#endif
\r
\r
@@
-563,17
+558,17
@@
static void DrawDisplayFull()
if(hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }
\r
\r
currpri = 0;
\r
if(hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }
\r
\r
currpri = 0;
\r
- DrawLayerFull(1, HighCacheB, START_ROW, (maxcolc<<16)|END_ROW);
\r
+ DrawLayerFull(1, HighCache
2
B, START_ROW, (maxcolc<<16)|END_ROW);
\r
switch(hvwin) {
\r
case 4:
\r
// fullscreen window
\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 0);
\r
switch(hvwin) {
\r
case 4:
\r
// fullscreen window
\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 0);
\r
- HighCacheA[1] = 0;
\r
+ HighCache
2
A[1] = 0;
\r
break;
\r
\r
case 3:
\r
// we have plane A and both v and h windows
\r
break;
\r
\r
case 3:
\r
// we have plane A and both v and h windows
\r
- DrawLayerFull(0, HighCacheA, planestart, planeend);
\r
+ DrawLayerFull(0, HighCache
2
A, planestart, planeend);
\r
DrawWindowFull( winstart&~0xff0000, (winend&~0xff0000)|(maxcolc<<16), 0); // h
\r
DrawWindowFull((winstart&~0xff)|START_ROW, (winend&~0xff)|END_ROW, 0); // v
\r
break;
\r
DrawWindowFull( winstart&~0xff0000, (winend&~0xff0000)|(maxcolc<<16), 0); // h
\r
DrawWindowFull((winstart&~0xff)|START_ROW, (winend&~0xff)|END_ROW, 0); // v
\r
break;
\r
@@
-581,20
+576,20
@@
static void DrawDisplayFull()
case 2:
\r
case 1:
\r
// both window and plane A visible, window is vertical XOR horizontal
\r
case 2:
\r
case 1:
\r
// both window and plane A visible, window is vertical XOR horizontal
\r
- DrawLayerFull(0, HighCacheA, planestart, planeend);
\r
+ DrawLayerFull(0, HighCache
2
A, planestart, planeend);
\r
DrawWindowFull(winstart, winend, 0);
\r
break;
\r
\r
default:
\r
// fullscreen plane A
\r
DrawWindowFull(winstart, winend, 0);
\r
break;
\r
\r
default:
\r
// fullscreen plane A
\r
- DrawLayerFull(0, HighCacheA, START_ROW, (maxcolc<<16)|END_ROW);
\r
+ DrawLayerFull(0, HighCache
2
A, START_ROW, (maxcolc<<16)|END_ROW);
\r
break;
\r
}
\r
DrawAllSpritesFull(0, maxw);
\r
\r
#ifdef USE_CACHE
\r
break;
\r
}
\r
DrawAllSpritesFull(0, maxw);
\r
\r
#ifdef USE_CACHE
\r
- if(HighCache
B[1]) DrawTilesFromCacheF(HighCache
B);
\r
- if(HighCache
A[1]) DrawTilesFromCacheF(HighCache
A);
\r
+ if(HighCache
2B[1]) DrawTilesFromCacheF(HighCache2
B);
\r
+ if(HighCache
2A[1]) DrawTilesFromCacheF(HighCache2
A);
\r
switch(hvwin) {
\r
case 4:
\r
// fullscreen window
\r
switch(hvwin) {
\r
case 4:
\r
// fullscreen window
\r
@@
-621,7
+616,7
@@
static void DrawDisplayFull()
}
\r
\r
\r
}
\r
\r
\r
-void PicoFrameFull()
\r
+
PICO_INTERNAL
void PicoFrameFull()
\r
{
\r
// prepare cram?
\r
if(PicoPrepareCram) PicoPrepareCram();
\r
{
\r
// prepare cram?
\r
if(PicoPrepareCram) PicoPrepareCram();
\r