80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Made the video_copy stuff Unix-friendly.

Browse Source
This commit is contained in:
OBattler
2021-10-06 23:18:33 +02:00
parent 90ac317a78
commit 6ee1fb490a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/86box/video.h
View File

@@ -133,10 +133,15 @@ extern int readflash;
/* Function handler pointers. */ /* Function handler pointers. */
extern void (*video_recalctimings)(void); extern void (*video_recalctimings)(void);
extern void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size);
extern void video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len); extern void video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len);
#ifdef _WIN32
extern void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size);
extern void * __cdecl video_transform_copy(void *_Dst, const void *_Src, size_t _Size); extern void * __cdecl video_transform_copy(void *_Dst, const void *_Src, size_t _Size);
#ele
extern void * (*video_copy)(void *__restrict _Dst, const void *__restrict _Src, size_t _Size);
extern void * video_transform_copy(void *__restrict _Dst, const void *__restrict _Src, size_t _Size);
#endif
/* Table functions. */ /* Table functions. */

9
src/video/video.c
View File

@@ -114,7 +114,11 @@ static const video_timings_t *vid_timings;
static uint32_t cga_2_table[16]; static uint32_t cga_2_table[16];
static uint8_t thread_run = 0; static uint8_t thread_run = 0;
#ifdef _WIN32
void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy; void * __cdecl (*video_copy)(void *_Dst, const void *_Src, size_t _Size) = memcpy;
#else
void * (*video_copy)(void *__restrict, const void *__restrict, size_t);
#endif
PALETTE cgapal = { PALETTE cgapal = {
@@ -419,8 +423,13 @@ video_screenshot(uint32_t *buf, int start_x, int start_y, int row_len)
} }
#ifdef _WIN32
void * __cdecl void * __cdecl
video_transform_copy(void *_Dst, const void *_Src, size_t _Size) video_transform_copy(void *_Dst, const void *_Src, size_t _Size)
#else
void *
video_transform_copy(void *__restrict _Dst, const void *__restrict _Src, size_t _Size)
#endif
{ {
int i; int i;
uint32_t *dest_ex = (uint32_t *) _Dst; uint32_t *dest_ex = (uint32_t *) _Dst;