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

Added the IBM 5161 ISA expansion for PC and XT;

Browse Source 
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port;
Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX);
Finished the 586MC1;
Added 8087 emulation;
Moved Cyrix 6x86'es to the Dev branch;
Sanitized/cleaned up memregs.c/h and intel.c/h;
Split the chipsets from machines and sanitized Port 92 emulation;
Added support for the 15bpp mode to the Compaq ATI 28800;
Moved the MR 386DX and 486 machines to the Dev branch;
Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00;
Ported the new timer code from PCem;
Cleaned up the CPU table of unused stuff and better optimized its structure;
Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch;
Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem;
Added the AHA-1540A and the BusTek BT-542B;
Moved the Sumo SCSI-AT to the Dev branch;
Minor IDE, FDC, and floppy drive code clean-ups;
Made NCR 5380/53C400-based cards' BIOS address configurable;
Got rid of the legacy romset variable;
Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit;
Added the Amstead PPC512 per PCem patch by John Elliott;
Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages);
Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing;
Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem;
Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit;
Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement;
Amstrad MegaPC does now works correctly with non-internal graphics card;
The SLiRP code no longer casts a packed struct type to a non-packed struct type;
The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present;
The S3 Virge on BeOS is no longer broken (was broken by build #1591);
OS/2 2.0 build 6.167 now sees key presses again;
Xi8088 now work on CGA again;
86F images converted from either the old or new variants of the HxC MFM format now work correctly;
Hardware interrupts with a vector of 0xFF are now handled correctly;
OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct;
Fixed VNC keyboard input bugs;
Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g  / 81 MIDI play no longer hangs with the build's own VTD driver;
Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly;
Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4;
Compaq Portable now works with all graphics cards;
Fixed various MDSI Genius bugs;
Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly;
Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355;
OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400.
Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391.
Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389.
Fixed a minor IDE timing bug, fixes #388.
Fixed Toshiba T1000 RAM issues, fixes #379.
Fixed EGA/(S)VGA overscan border handling, fixes #378;
Got rid of the now long useless IDE channel 2 auto-removal, fixes #370;
Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366;
Ported the Unicode CD image file name fix from VARCem, fixes #365;
Fixed high density floppy disks on the Xi8088, fixes #359;
Fixed some bugs in the Hercules emulation, fixes #346, fixes #358;
Fixed the SCSI hard disk mode sense pages, fixes #356;
Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349;
Fixed bugs in the serial mouse emulation, fixes #344;
Compiled 86Box binaries now include all the required .DLL's, fixes #341;
Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
2019-09-20 14:02:30 +02:00
parent b06296bbf6
commit 552a87ea3d
524 changed files with 129555 additions and 21862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
src/win/win_d2d.cpp
View File

@@ -8,11 +8,11 @@
*
* Rendering module for Microsoft Direct2D.
*
* Version: @(#)win_d2d.cpp 1.0.2 2018/10/18
* Version: @(#)win_d2d.cpp 1.0.3 2019/03/09
*
* Authors: David Hrdlička, <hrdlickadavid@outlook.com>
*
* Copyright 2018 David Hrdlička.
* Copyright 2018,2019 David Hrdlička.
*/
#include <stdarg.h>
#include <stdio.h>
@@ -35,6 +35,7 @@
#include "../device.h"
#include "../video/video.h"
#include "../plat.h"
#include "../plat_dynld.h"
#include "../ui.h"
#include "win.h"
#include "win_d2d.h"
@@ -47,9 +48,24 @@ static ID2D1HwndRenderTarget *d2d_hwndRT;
static ID2D1BitmapRenderTarget *d2d_btmpRT;
static ID2D1Bitmap *d2d_bitmap;
static int d2d_width, d2d_height, d2d_screen_width, d2d_screen_height, d2d_fs;
static volatile int d2d_enabled = 0;
#endif
/* Pointers to the real functions. */
static HRESULT (*D2D1_CreateFactory)(D2D1_FACTORY_TYPE facType,
REFIID riid,
CONST D2D1_FACTORY_OPTIONS *pFacOptions,
void **ppIFactory);
static dllimp_t d2d_imports[] = {
{ "D2D1CreateFactory", &D2D1_CreateFactory },
{ NULL, NULL }
};
static volatile void *d2d_handle; /* handle to WinPcap DLL */
#ifdef ENABLE_D2D_LOG
int d2d_do_log = ENABLE_D2D_LOG;
@@ -76,7 +92,7 @@ d2d_stretch(float *w, float *h, float *x, float *y)
{
double dw, dh, dx, dy, temp, temp2, ratio_w, ratio_h, gsr, hsr;
switch (video_fullscreen_scale)
switch (video_fullscreen_scale)
{
case FULLSCR_SCALE_FULL:
*w = d2d_screen_width;
@@ -86,35 +102,34 @@ d2d_stretch(float *w, float *h, float *x, float *y)
break;
case FULLSCR_SCALE_43:
case FULLSCR_SCALE_KEEPRATIO:
dw = (double) d2d_screen_width;
dh = (double) d2d_screen_height;
temp = (dh / 3.0) * 4.0;
dx = (dw - temp) / 2.0;
dw = temp;
*w = (float) dw;
*h = (float) dh;
*x = (float) dx;
*y = 0;
break;
case FULLSCR_SCALE_SQ:
dw = (double) d2d_screen_width;
dh = (double) d2d_screen_height;
temp = ((double) *w);
temp2 = ((double) *h);
dx = (dw / 2.0) - ((dh * temp) / (temp2 * 2.0));
dy = 0.0;
if (dx < 0.0)
hsr = dw / dh;
if (video_fullscreen_scale == FULLSCR_SCALE_43)
gsr = 4.0 / 3.0;
else
gsr = ((double) *w) / ((double) *h);
if (gsr <= hsr)
{
dx = 0.0;
dy = (dw / 2.0) - ((dh * temp2) / (temp * 2.0));
temp = dh * gsr;
dx = (dw - temp) / 2.0;
dw = temp;
*w = (float) dw;
*h = (float) dh;
*x = (float) dx;
*y = 0;
}
else
{
temp = dw / gsr;
dy = (dh - temp) / 2.0;
dh = temp;
*w = (float) dw;
*h = (float) dh;
*x = 0;
*y = (float) dy;
}
dw -= (dx * 2.0);
dh -= (dy * 2.0);
*w = (float) dw;
*h = (float) dh;
*x = (float) dx;
*y = (float) dy;
break;
case FULLSCR_SCALE_INT:
@@ -137,33 +152,6 @@ d2d_stretch(float *w, float *h, float *x, float *y)
*x = (float) dx;
*y = (float) dy;
break;
case FULLSCR_SCALE_KEEPRATIO:
dw = (double) d2d_screen_width;
dh = (double) d2d_screen_height;
hsr = dw / dh;
gsr = ((double) *w) / ((double) *h);
if (gsr <= hsr)
{
temp = dh * gsr;
dx = (dw - temp) / 2.0;
dw = temp;
*w = (float) dw;
*h = (float) dh;
*x = (float) dx;
*y = 0;
}
else
{
temp = dw / gsr;
dy = (dh - temp) / 2.0;
dh = temp;
*w = (float) dw;
*h = (float) dh;
*x = 0;
*y = (float) dy;
}
break;
}
}
#endif
@@ -179,7 +167,7 @@ d2d_blit(int x, int y, int y1, int y2, int w, int h)
int yy;
D2D1_RECT_U rectU;
ID2D1Bitmap *fs_bitmap;
ID2D1Bitmap *fs_bitmap = 0;
ID2D1RenderTarget *RT;
float fs_x, fs_y;
@@ -188,6 +176,11 @@ d2d_blit(int x, int y, int y1, int y2, int w, int h)
d2d_log("Direct2D: d2d_blit(x=%d, y=%d, y1=%d, y2=%d, w=%d, h=%d)\n", x, y, y1, y2, w, h);
if (!d2d_enabled) {
video_blit_complete();
return;
}
// TODO: Detect double scanned mode and resize render target
// appropriately for more clear picture
@@ -244,12 +237,12 @@ d2d_blit(int x, int y, int y1, int y2, int w, int h)
if (video_grayscale || invert_display)
video_transform_copy(
(uint32_t *) &(((uint8_t *)srcdata)[yy * w * 4]),
&(((uint32_t *)buffer32->line[y + yy])[x]),
&(buffer32->line[y + yy][x]),
w);
else
memcpy(
(uint32_t *) &(((uint8_t *)srcdata)[yy * w * 4]),
&(((uint32_t *)buffer32->line[y + yy])[x]),
&(buffer32->line[y + yy][x]),
w * 4);
}
}
@@ -325,6 +318,12 @@ d2d_close(void)
{
d2d_log("Direct2D: d2d_close()\n");
/* Unregister our renderer! */
video_setblit(NULL);
if (d2d_enabled)
d2d_enabled = 0;
#ifdef USE_D2D
if (d2d_bitmap)
{
@@ -358,6 +357,12 @@ d2d_close(void)
d2d_hwnd = NULL;
old_hwndMain = NULL;
}
/* Unload the DLL if possible. */
if (d2d_handle != NULL) {
dynld_close((void *)d2d_handle);
d2d_handle = NULL;
}
#endif
}
@@ -372,7 +377,7 @@ d2d_init_common(int fs)
d2d_log("Direct2D: d2d_init_common(fs=%d)\n", fs);
cgapal_rebuild();
d2d_handle = dynld_module("d2d1.dll", d2d_imports);
if (fs)
{
@@ -404,10 +409,8 @@ d2d_init_common(int fs)
SetWindowPos(d2d_hwnd, HWND_TOPMOST, 0, 0, d2d_screen_width, d2d_screen_height, SWP_SHOWWINDOW);
}
if (SUCCEEDED(hr))
{
hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, &d2d_factory);
}
hr = D2D1_CreateFactory(D2D1_FACTORY_TYPE_MULTI_THREADED, __uuidof(ID2D1Factory),
NULL, reinterpret_cast <void **>(&d2d_factory));
if (fs)
{
@@ -459,6 +462,8 @@ d2d_init_common(int fs)
return(0);
}
d2d_enabled = 1;
return(1);
}
#endif
@@ -501,7 +506,7 @@ d2d_pause(void)
void
d2d_take_screenshot(wchar_t *fn)
d2d_take_screenshot(const wchar_t *fn)
{
// Saving a screenshot of a Direct2D render target is harder than
// one would think. Keeping this stubbed for the moment
@@ -509,4 +514,11 @@ d2d_take_screenshot(wchar_t *fn)
d2d_log("Direct2D: d2d_take_screenshot(%s)\n", fn);
return;
}
}
void
d2d_enable(int enable)
{
d2d_enabled = enable;
}