claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VIDEO: Fix compilation of voodoo.c in MSVC

Browse Source 
This required changing dynamically allocated stack arrays to using
_alloca(), adding an additional include for the __m128i type, and
changing the prototype of the init() function to conform with the
device_t requirements
This commit is contained in:
darkstar
2018-02-22 00:24:36 +01:00
parent e5c3fce2a7
commit f0b191fa8d
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/video/vid_voodoo.c
View File

@@ -59,6 +59,9 @@
#include "vid_svga.h"
#include "vid_voodoo.h"
#include "vid_voodoo_dither.h"
#ifdef _MSC_VER
#include <malloc.h>
#endif
#ifdef MIN
#undef MIN
@@ -7227,7 +7230,16 @@ static void voodoo_filterline_v1(voodoo_t *voodoo, uint8_t *fil, int column, uin
int x;
// Scratchpad for avoiding feedback streaks
#ifdef _MSC_VER
if ((voodoo->h_disp) * 3 > 512 * 1024)
{
pclog("voodoo_filterline_v1: possible stack overflow detected. h_disp is %d", voodoo->h_disp);
return;
}
uint8_t *fil3 = (uint8_t *)_alloca((voodoo->h_disp) * 3);
#else
uint8_t fil3[(voodoo->h_disp) * 3];
#endif
/* 16 to 32-bit */
for (x=0; x<column;x++)
@@ -7293,7 +7305,16 @@ static void voodoo_filterline_v2(voodoo_t *voodoo, uint8_t *fil, int column, uin
int x;
// Scratchpad for blending filter
uint8_t fil3[(voodoo->h_disp) * 3];
#ifdef _MSC_VER
if ((voodoo->h_disp) * 3 > 512 * 1024)
{
pclog("voodoo_filterline_v2: possible stack overflow detected. h_disp is %d", voodoo->h_disp);
return;
}
uint8_t *fil3 = (uint8_t *)_alloca((voodoo->h_disp) * 3);
#else
uint8_t fil3[(voodoo->h_disp) * 3];
#endif
/* 16 to 32-bit */
for (x=0; x<column;x++)
@@ -7402,7 +7423,16 @@ void voodoo_callback(void *p)
if (voodoo->scrfilter && voodoo->scrfilterEnabled)
{
uint8_t fil[(voodoo->h_disp) * 3]; /* interleaved 24-bit RGB */
#ifdef _MSC_VER
if ((voodoo->h_disp) * 3 > 512 * 1024)
{
pclog("voodoo_callback: possible stack overflow detected. h_disp is %d", voodoo->h_disp);
return;
}
uint8_t *fil = (uint8_t *)_alloca((voodoo->h_disp) * 3);
#else
uint8_t fil[(voodoo->h_disp) * 3]; /* interleaved 24-bit RGB */
#endif
if (voodoo->type == VOODOO_2)
voodoo_filterline_v2(voodoo, fil, voodoo->h_disp, src, voodoo->line);
@@ -7748,7 +7778,7 @@ void *voodoo_card_init()
return voodoo;
}
void *voodoo_init()
void *voodoo_init(struct _device_ *dev)
{
voodoo_set_t *voodoo_set = malloc(sizeof(voodoo_set_t));
uint32_t tmuConfig = 1;

3
src/video/vid_voodoo_codegen_x86.h
View File

@@ -55,6 +55,9 @@
# include <windows.h>
#endif
#ifdef _MSC_VER
#include <emmintrin.h>
#endif
#include <xmmintrin.h>
#define BLOCK_NUM 8