claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Even more sonarlint work

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-06-01 18:32:25 -04:00
parent ef2b84ed63
commit d1127e68fa
89 changed files with 2509 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/video/vid_voodoo_fb.c
View File

@@ -62,7 +62,8 @@ uint16_t
voodoo_fb_readw(uint32_t addr, void *p)
{
voodoo_t *voodoo = (voodoo_t *) p;
int x, y;
int x;
int y;
uint32_t read_addr;
uint16_t temp;
@@ -102,7 +103,8 @@ uint32_t
voodoo_fb_readl(uint32_t addr, void *p)
{
voodoo_t *voodoo = (voodoo_t *) p;
int x, y;
int x;
int y;
uint32_t read_addr;
uint32_t temp;
@@ -142,7 +144,9 @@ voodoo_fb_readl(uint32_t addr, void *p)
static inline uint16_t
do_dither(voodoo_params_t *params, rgba8_t col, int x, int y)
{
int r, g, b;
int r;
int g;
int b;
if (dither) {
if (dither2x2) {
@@ -168,8 +172,10 @@ voodoo_fb_writew(uint32_t addr, uint16_t val, void *p)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_params_t *params = &voodoo->params;
int x, y;
uint32_t write_addr, write_addr_aux;
int x;
int y;
uint32_t write_addr;
uint32_t write_addr_aux;
rgba8_t colour_data;
uint16_t depth_data;
uint8_t alpha_data;
@@ -265,7 +271,10 @@ voodoo_fb_writew(uint32_t addr, uint16_t val, void *p)
if (params->alphaMode & (1 << 4)) {
uint16_t dat = *(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]);
int dest_r, dest_g, dest_b, dest_a;
int dest_r;
int dest_g;
int dest_b;
int dest_a;
dest_r = (dat >> 8) & 0xf8;
dest_g = (dat >> 3) & 0xfc;
@@ -299,12 +308,15 @@ voodoo_fb_writel(uint32_t addr, uint32_t val, void *p)
{
voodoo_t *voodoo = (voodoo_t *) p;
voodoo_params_t *params = &voodoo->params;
int x, y;
uint32_t write_addr, write_addr_aux;
int x;
int y;
uint32_t write_addr;
uint32_t write_addr_aux;
rgba8_t colour_data[2];
uint16_t depth_data[2];
uint8_t alpha_data[2];
int write_mask = 0, count = 1;
int write_mask = 0;
int count = 1;
depth_data[0] = depth_data[1] = voodoo->params.zaColor & 0xffff;
alpha_data[0] = alpha_data[1] = voodoo->params.zaColor >> 24;
@@ -412,7 +424,10 @@ voodoo_fb_writel(uint32_t addr, uint32_t val, void *p)
if (params->alphaMode & (1 << 4)) {
uint16_t dat = *(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]);
int dest_r, dest_g, dest_b, dest_a;
int dest_r;
int dest_g;
int dest_b;
int dest_a;
dest_r = (dat >> 8) & 0xf8;
dest_g = (dat >> 3) & 0xfc;
@@ -435,9 +450,7 @@ skip_pixel:
write_addr_aux += 2;
}
} else {
int c;
for (c = 0; c < count; c++) {
for (int c = 0; c < count; c++) {
if (write_mask & LFB_WRITE_COLOUR)
*(uint16_t *) (&voodoo->fb_mem[write_addr & voodoo->fb_mask]) = do_dither(&voodoo->params, colour_data[c], (x >> 1) + c, y);
if (write_mask & LFB_WRITE_DEPTH)