From 047042f3d08b2eb272256f0e17b2391c85756f49 Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Sat, 20 Aug 2016 16:29:14 +0300 Subject: [PATCH] hacked support for both 16 and 32 bpp framebuffers --- src/main.c | 10 +++-- src/tunnel.c | 139 +++++++++++++++++++++++++++++++++++++++------------------- src/tunnel.h | 4 +- 3 files changed, 103 insertions(+), 50 deletions(-) diff --git a/src/main.c b/src/main.c index 8881963..9e27509 100644 --- a/src/main.c +++ b/src/main.c @@ -21,16 +21,18 @@ static int quit; int main(void) { fbgfx_save_video_mode(); - fbgfx_get_video_mode(&xsz, &ysz, &depth); + if(!(vmem = fbgfx_get_video_mode(&xsz, &ysz, &depth))) { + return 1; + } - if(!(vmem = fbgfx_set_video_mode(xsz, ysz, 16))) { + /*if(!(vmem = fbgfx_set_video_mode(xsz, ysz, 16))) { return 1; } fbgfx_get_video_mode(&xsz, &ysz, &depth); if(depth != 16) { fprintf(stderr, "failed to set color depth: 16bpp\n"); goto end; - } + }*/ if(fbev_init() == -1) { goto end; } @@ -38,7 +40,7 @@ int main(void) fbev_mbutton(mouse, 0); fbev_mmotion(motion, 0); - if(init_tunnel(xsz, ysz) == -1) { + if(init_tunnel(xsz, ysz, depth) == -1) { goto end; } diff --git a/src/tunnel.c b/src/tunnel.c index 85ca7b4..f4b3984 100644 --- a/src/tunnel.c +++ b/src/tunnel.c @@ -14,7 +14,10 @@ extern unsigned long time_msec; -static void draw_tunnel_range(unsigned short *pixels, int starty, int num_lines); +static void (*draw_tunnel_range)(void*, int, int); + +static void draw_tunnel_range16(void *pixels, int starty, int num_lines); +static void draw_tunnel_range32(void *pixels, int starty, int num_lines); static int count_bits(unsigned int x); static int count_zeros(unsigned int x); @@ -30,13 +33,25 @@ static unsigned int tex_xmask, tex_ymask; static struct thread_pool *tpool; -int init_tunnel(int x, int y) +int init_tunnel(int x, int y, int bpp) { int i, j, n; unsigned int *tmap; unsigned char *fog; float aspect = (float)x / (float)y; + switch(bpp) { + case 16: + draw_tunnel_range = draw_tunnel_range16; + break; + case 32: + draw_tunnel_range = draw_tunnel_range32; + break; + default: + fprintf(stderr, "unsupported color depth: %d\n", bpp); + return -1; + } + xsz = x; ysz = y; vxsz = xsz / USCALE; @@ -111,7 +126,7 @@ void destroy_tunnel(void) #define NUM_WORK_ITEMS 32 static struct work { - unsigned short *pixels; + void *pixels; int starty, num_lines; } work[NUM_WORK_ITEMS]; @@ -121,7 +136,7 @@ static void work_func(void *cls) draw_tunnel_range(w->pixels, w->starty, w->num_lines); } -void draw_tunnel(unsigned short *pixels) +void draw_tunnel(void *pixels) { int i, num_lines = vysz / NUM_WORK_ITEMS; for(i=0; i> 16) & 0xffff) << tex_xshift) >> 16; + unsigned int ty = ((tpacked & 0xffff) << tex_yshift) >> 16; + tx += toffs; + ty += toffs << 1; + + tx &= tex_xmask; + ty &= tex_ymask; + + col = tex_pixels[(ty << tex_xshift) + tx]; + r = col & 0xff; + g = (col >> 8) & 0xff; + b = (col >> 16) & 0xff; + + *rp = (r * fog) >> 8; + *gp = (g * fog) >> 8; + *bp = (b * fog) >> 8; +} + #define PACK_RGB16(r, g, b) \ (((((r) >> 3) & 0x1f) << 11) | ((((g) >> 2) & 0x3f) << 5) | ((b) & 0x1f)) +#define PACK_RGB32(r, g, b) \ + ((((r) & 0xff) << 16) | (((g) & 0xff) << 8) | ((b) & 0xff)) + +#define PUTPIXEL(pixtype, col) \ + do { \ + int k; \ + pixtype *ptr = pixels; \ + for(k=0; k> 16) & 0xffff) << tex_xshift) >> 16; - unsigned int ty = ((*tmap & 0xffff) << tex_yshift) >> 16; - ++tmap; - - tx += toffs; - ty += toffs << 1; - - tx &= tex_xmask; - ty &= tex_ymask; - - col = tex_pixels[(ty << tex_xshift) + tx]; - r = col & 0xff; - g = (col >> 8) & 0xff; - b = (col >> 16) & 0xff; - - r = (r * *fog) >> 8; - g = (g * *fog) >> 8; - b = (b * *fog) >> 8; - ++fog; - - col = ((((r >> 3) & 0x1f) << 11) | (((g >> 2) & 0x3f) << 5) | ((b >> 3) & 0x1f)); - - ptr = pixels; - for(k=0; k