Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement Banshee/V3 CLUT lookup on 16-bit RGB overlay.

Browse source
This commit is contained in:
SarahW 2020-11-19 19:38:34 +00:00
commit 49ba35733e
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/vid_voodoo_banshee.c
View file

@ -150,6 +150,8 @@ enum
#define VIDPROCCFG_CURSOR_MODE (1 << 1) #define VIDPROCCFG_CURSOR_MODE (1 << 1)
#define VIDPROCCFG_HALF_MODE (1 << 4) #define VIDPROCCFG_HALF_MODE (1 << 4)
#define VIDPROCCFG_OVERLAY_ENABLE (1 << 8) #define VIDPROCCFG_OVERLAY_ENABLE (1 << 8)
#define VIDPROCCFG_OVERLAY_CLUT_BYPASS (1 << 11)
#define VIDPROCCFG_OVERLAY_CLUT_SEL (1 << 13)
#define VIDPROCCFG_H_SCALE_ENABLE (1 << 14) #define VIDPROCCFG_H_SCALE_ENABLE (1 << 14)
#define VIDPROCCFG_V_SCALE_ENABLE (1 << 15) #define VIDPROCCFG_V_SCALE_ENABLE (1 << 15)
#define VIDPROCCFG_FILTER_MODE_MASK (3 << 16) #define VIDPROCCFG_FILTER_MODE_MASK (3 << 16)
@ -1641,7 +1643,12 @@ void banshee_hwcursor_draw(svga_t *svga, int displine)
int g = (data >> 5) & 0x3f; \ int g = (data >> 5) & 0x3f; \
int b = data >> 11; \ int b = data >> 11; \
\ \
buf[wp++] = (r << 3) | (g << 10) | (b << 19); \ if (banshee->vidProcCfg & VIDPROCCFG_OVERLAY_CLUT_BYPASS) \
buf[wp++] = (r << 3) | (g << 10) | (b << 19); \
else \
buf[wp++] = (clut[r << 3] & 0x0000ff) | \
(clut[g << 2] & 0x00ff00) | \
(clut[b << 3] & 0xff0000); \
src += 2; \ src += 2; \
} \ } \
} while (0) } while (0)
@ -1660,7 +1667,12 @@ void banshee_hwcursor_draw(svga_t *svga, int displine)
int g = (data >> 5) & 0x3f; \ int g = (data >> 5) & 0x3f; \
int b = data >> 11; \ int b = data >> 11; \
\ \
buf[wp++] = (r << 3) | (g << 10) | (b << 19); \ if (banshee->vidProcCfg & VIDPROCCFG_OVERLAY_CLUT_BYPASS) \
buf[wp++] = (r << 3) | (g << 10) | (b << 19); \
else \
buf[wp++] = (clut[r << 3] & 0x0000ff) | \
(clut[g << 2] & 0x00ff00) | \
(clut[b << 3] & 0xff0000); \
} \ } \
} while (0) } while (0)
@ -1928,6 +1940,7 @@ static void banshee_overlay_draw(svga_t *svga, int displine)
uint32_t src_x = 0; uint32_t src_x = 0;
unsigned int y_coeff = (voodoo->overlay.src_y & 0xfffff) >> 4; unsigned int y_coeff = (voodoo->overlay.src_y & 0xfffff) >> 4;
int skip_filtering; int skip_filtering;
uint32_t *clut = &svga->pallook[(banshee->vidProcCfg & VIDPROCCFG_OVERLAY_CLUT_SEL) ? 256 : 0];
if (svga->render == svga_render_null && if (svga->render == svga_render_null &&
!svga->changedvram[src_addr >> 12] && !svga->changedvram[src_addr2 >> 12] && !svga->changedvram[src_addr >> 12] && !svga->changedvram[src_addr2 >> 12] &&