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

Fixing some warnings (that may have caused bugs in s3_virge and voodoo) and other fixes. Removed Mingw64 makefile.

Browse Source
This commit is contained in:
waltje
2017-11-03 03:16:04 -05:00
parent afb96a79da
commit f5d4436672
7 changed files with 51 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/vid_s3_virge.c
View File

@@ -8,7 +8,7 @@
*
* S3 ViRGE emulation.
*
* Version: @(#)vid_s3_virge.c 1.0.2 2017/10/16
* Version: @(#)vid_s3_virge.c 1.0.3 2017/11/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -2920,7 +2920,7 @@ static void tri(virge_t *virge, s3d_t *s3d_tri, s3d_state_t *state, int yc, int3
int bpp = (s3d_tri->cmd_set >> 2) & 7;
uint32_t dest_offset, z_offset;
uint32_t dest_offset = 0, z_offset = 0;
uint32_t src_col;
int src_r = 0, src_g = 0, src_b = 0;

8
src/video/vid_voodoo.c
View File

@@ -8,7 +8,7 @@
*
* Emulation of the 3DFX Voodoo Graphics controller.
*
* Version: @(#)vid_voodoo.c 1.0.6 2017/11/01
* Version: @(#)vid_voodoo.c 1.0.7 2017/11/02
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* leilei
@@ -5576,7 +5576,11 @@ static void voodoo_fb_writew(uint32_t addr, uint16_t val, void *p)
*(uint16_t *)(&voodoo->fb_mem[write_addr_aux & voodoo->fb_mask]) = new_depth;
skip_pixel:
#if 1
x = 0;
#else
x = x;
#endif
}
}
else
@@ -5903,7 +5907,7 @@ static void wake_fifo_threads(voodoo_set_t *set, voodoo_t *voodoo)
static uint32_t voodoo_readl(uint32_t addr, void *p)
{
voodoo_t *voodoo = (voodoo_t *)p;
uint32_t temp;
uint32_t temp = 0;
int fifo_size;
voodoo->rd_count++;
addr &= 0xffffff;