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

Video (API) cleanup and minor stuff. Oh, and the VNC files :P

Browse Source
This commit is contained in:
waltje
2017-10-14 13:38:05 -04:00
parent c350e79242
commit 3453a66f16
18 changed files with 412 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/win/win_d3d.cc
View File

@@ -8,7 +8,7 @@
*
* Direct3D 9 rendererer and screenshots taking.
*
* Version: @(#)win_d3d.cc 1.0.3 2017/10/13
* Version: @(#)win_d3d.cc 1.0.4 2017/10/13
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -26,14 +26,14 @@ extern "C" void fatal(const char *format, ...);
extern "C" void pclog(const char *format, ...);
extern "C" void device_force_redraw(void);
extern "C" void video_blit_complete(void);
extern "C" void d3d_take_screenshot(wchar_t *fn);
void d3d_init_objects(void);
void d3d_close_objects(void);
void d3d_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h);
void d3d_blit_memtoscreen_8(int x, int y, int w, int h);
static void blit_memtoscreen(int x, int y, int y1, int y2, int w, int h);
static void blit_memtoscreen_8(int x, int y, int w, int h);
static LPDIRECT3D9 d3d = NULL;
static LPDIRECT3DDEVICE9 d3ddev = NULL;
@@ -101,12 +101,7 @@ int d3d_init(HWND h)
d3d_init_objects();
#if 0
video_setblit(d3d_blit_memtoscreen_8, d3d_blit_memtoscreen);
#else
video_blit_memtoscreen_func = d3d_blit_memtoscreen;
video_blit_memtoscreen_8_func = d3d_blit_memtoscreen_8;
#endif
video_setblit(blit_memtoscreen_8, blit_memtoscreen);
return 1;
}
@@ -238,7 +233,7 @@ int d3d_pause(void)
return(0);
}
void d3d_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
static void blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
{
HRESULT hr = D3D_OK;
VOID* pVoid;
@@ -332,7 +327,7 @@ void d3d_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
PostMessage(d3d_hwnd, WM_RESETD3D, 0, 0);
}
void d3d_blit_memtoscreen_8(int x, int y, int w, int h)
static void blit_memtoscreen_8(int x, int y, int w, int h)
{
VOID* pVoid;
D3DLOCKED_RECT dr;