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

Removed Direct2D.

Browse Source
This commit is contained in:
OBattler
2020-04-17 02:06:00 +02:00
parent 44d3eb42de
commit 4bc41197b9
6 changed files with 7 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/86box/win.h
View File

@@ -65,18 +65,10 @@
#define WM_HAS_SHUTDOWN 0x8897
#ifdef USE_VNC
#ifdef USE_D2D
#define RENDERERS_NUM 4
#else
#define RENDERERS_NUM 3
#endif
#else
#ifdef USE_D2D
#define RENDERERS_NUM 3
#else
#define RENDERERS_NUM 2
#endif
#endif
#ifdef __cplusplus

26
src/include/86box/win_d2d.h
View File

@@ -1,26 +0,0 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Definitions for the Direct2D rendering module.
*
*
*
* Authors: David Hrdlička, <hrdlickadavid@outlook.com>
*
* Copyright 2018,2019 David Hrdlička.
*/
#ifndef WIN_D2D_H
# define WIN_D2D_H
extern void d2d_close(void);
extern int d2d_init(HWND h);
extern int d2d_init_fs(HWND h);
extern int d2d_pause(void);
extern void d2d_enable(int enable);
#endif /*WIN_D2D_H*/

39
src/win/Makefile.mingw
View File

@@ -47,9 +47,6 @@ ifeq ($(DEV_BUILD), y)
ifndef CRASHDUMP
CRASHDUMP := y
endif
ifndef D2D
D2D := y
endif
ifndef LASERXT
LASERXT := y
endif
@@ -111,9 +108,6 @@ else
ifndef CRASHDUMP
CRASHDUMP := n
endif
ifndef D2D
D2D := n
endif
ifndef LASERXT
LASERXT := n
endif
@@ -183,9 +177,6 @@ endif
ifndef USB
USB := n
endif
ifndef RDP
RDP := n
endif
ifndef DINPUT
DINPUT := y
endif
@@ -400,13 +391,6 @@ MUNTOBJ := midi_mt32.o \
Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o
endif
ifeq ($(D2D), y)
OPTS += -DUSE_D2D
RFLAGS += -DUSE_D2D
D2DLIB := -ld2d1
D2DOBJ := win_d2d.o
endif
ifeq ($(VNC), y)
OPTS += -DUSE_VNC
RFLAGS += -DUSE_VNC
@@ -418,17 +402,6 @@ VNCLIB += -lvncserver
VNCOBJ := vnc.o vnc_keymap.o
endif
ifeq ($(RDP), y)
OPTS += -DUSE_RDP
RFLAGS += -DUSE_RDP
ifneq ($(RDP_PATH), )
OPTS += -I$(RDP_PATH)\INCLUDE
RDPLIB := -L$(RDP_PATH)\LIB
endif
RDPLIB += -lrdp
RDPOBJ := rdp.o
endif
ifeq ($(DISCORD), y)
OPTS += -DUSE_DISCORD
RFLAGS += -DUSE_DISCORD
@@ -542,7 +515,7 @@ CXXFLAGS := $(CFLAGS)
MAINOBJ := pc.o config.o random.o timer.o io.o acpi.o apm.o dma.o nmi.o \
pic.o pit.o port_92.o ppi.o pci.o mca.o mcr.o mem.o \
rom.o device.o nvr.o nvr_at.o nvr_ps2.o sst_flash.o via_vt82c586b.o \
via_vt82c596b.o $(VNCOBJ) $(RDPOBJ)
via_vt82c596b.o $(VNCOBJ)
INTELOBJ := intel_flash.o \
intel_sio.o intel_piix.o
@@ -713,8 +686,8 @@ endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) \
$(USBOBJ) $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
$(PLATOBJ) $(UIOBJ) $(D2DOBJ) $(FSYNTHOBJ) $(MUNTOBJ) \
$(DEVBROBJ) $(DISCORDOBJ)
$(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) \
$(DISCORDOBJ)
ifdef EXOBJ
OBJ += $(EXOBJ)
endif
@@ -725,15 +698,9 @@ ifeq ($(DEBUG), y)
LIBS += -lssp
endif
ifeq ($(D2D), y)
LIBS += $(D2DLIB)
endif
ifeq ($(VNC), y)
LIBS += $(VNCLIB) -lws2_32
endif
ifeq ($(RDP), y)
LIBS += $(RDPLIB)
endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif

39
src/win/Makefile_ndr.mingw
View File

@@ -47,9 +47,6 @@ ifeq ($(DEV_BUILD), y)
ifndef CRASHDUMP
CRASHDUMP := y
endif
ifndef D2D
D2D := y
endif
ifndef LASERXT
LASERXT := y
endif
@@ -111,9 +108,6 @@ else
ifndef CRASHDUMP
CRASHDUMP := n
endif
ifndef D2D
D2D := n
endif
ifndef LASERXT
LASERXT := n
endif
@@ -186,9 +180,6 @@ endif
ifndef USB
USB := n
endif
ifndef RDP
RDP := n
endif
ifndef DINPUT
DINPUT := y
endif
@@ -409,13 +400,6 @@ MUNTOBJ := midi_mt32.o \
Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o
endif
ifeq ($(D2D), y)
OPTS += -DUSE_D2D
RFLAGS += -DUSE_D2D
D2DLIB := -ld2d1
D2DOBJ := win_d2d.o
endif
ifeq ($(VNC), y)
OPTS += -DUSE_VNC
RFLAGS += -DUSE_VNC
@@ -427,17 +411,6 @@ VNCLIB += -lvncserver
VNCOBJ := vnc.o vnc_keymap.o
endif
ifeq ($(RDP), y)
OPTS += -DUSE_RDP
RFLAGS += -DUSE_RDP
ifneq ($(RDP_PATH), )
OPTS += -I$(RDP_PATH)\INCLUDE
RDPLIB := -L$(RDP_PATH)\LIB
endif
RDPLIB += -lrdp
RDPOBJ := rdp.o
endif
ifeq ($(DISCORD), y)
OPTS += -DUSE_DISCORD
RFLAGS += -DUSE_DISCORD
@@ -546,7 +519,7 @@ CXXFLAGS := $(CFLAGS)
MAINOBJ := pc.o config.o random.o timer.o io.o acpi.o apm.o dma.o nmi.o \
pic.o pit.o port_92.o ppi.o pci.o mca.o mcr.o mem.o \
rom.o device.o nvr.o nvr_at.o nvr_ps2.o sst_flash.o via_vt82c586b.o \
via_vt82c596b.o $(VNCOBJ) $(RDPOBJ)
via_vt82c596b.o $(VNCOBJ)
INTELOBJ := intel_flash.o \
intel_sio.o intel_piix.o
@@ -717,8 +690,8 @@ endif
OBJ := $(MAINOBJ) $(INTELOBJ) $(CPUOBJ) $(CHIPSETOBJ) $(MCHOBJ) \
$(DEVOBJ) $(FDDOBJ) $(CDROMOBJ) $(ZIPOBJ) $(MOOBJ) $(HDDOBJ) \
$(USBOBJ) $(NETOBJ) $(PRINTOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) \
$(PLATOBJ) $(UIOBJ) $(D2DOBJ) $(FSYNTHOBJ) $(MUNTOBJ) \
$(DEVBROBJ) $(DISCORDOBJ)
$(PLATOBJ) $(UIOBJ) $(FSYNTHOBJ) $(MUNTOBJ) $(DEVBROBJ) \
$(DISCORDOBJ)
ifdef EXOBJ
OBJ += $(EXOBJ)
endif
@@ -726,15 +699,9 @@ endif
LIBS := -mwindows -lcomctl32 \
-lopenal -lole32
ifeq ($(D2D), y)
LIBS += $(D2DLIB)
endif
ifeq ($(VNC), y)
LIBS += $(VNCLIB) -lws2_32
endif
ifeq ($(RDP), y)
LIBS += $(RDPLIB)
endif
ifneq ($(WX), n)
LIBS += $(WX_LIBS) -lm
endif

19
src/win/win.c
View File

@@ -45,8 +45,7 @@
#ifdef USE_VNC
# include <86box/vnc.h>
#endif
# include <86box/win_d2d.h>
# include <86box/win_sdl.h>
#include <86box/win_sdl.h>
#include <86box/win.h>
@@ -90,9 +89,6 @@ static const struct {
{
{ "SDL_Software", 1, (int(*)(void*))sdl_inits, sdl_close, NULL, sdl_pause, sdl_enable },
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith, sdl_close, NULL, sdl_pause, sdl_enable }
#ifdef USE_D2D
,{ "D2D", 1, (int(*)(void*))d2d_init, d2d_close, NULL, d2d_pause, d2d_enable }
#endif
#ifdef USE_VNC
,{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
#endif
@@ -100,9 +96,6 @@ static const struct {
{
{ "SDL_Software", 1, (int(*)(void*))sdl_inits_fs, sdl_close, sdl_resize, sdl_pause, sdl_enable },
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith_fs, sdl_close, sdl_resize, sdl_pause, sdl_enable }
#ifdef USE_D2D
,{ "D2D", 1, (int(*)(void*))d2d_init_fs, d2d_close, NULL, d2d_pause, d2d_enable }
#endif
#ifdef USE_VNC
,{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
#endif
@@ -700,18 +693,8 @@ plat_vidapi_name(int api)
case 1:
break;
#ifdef USE_D2D
case 2:
name = "d2d";
break;
#endif
#ifdef USE_VNC
#ifdef USE_D2D
case 3:
#else
case 2:
#endif
name = "vnc";
break;
#endif

470
src/win/win_d2d.c
View File

@@ -1,470 +0,0 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Rendering module for Microsoft Direct2D.
*
*
*
* Authors: David Hrdlička, <hrdlickadavid@outlook.com>
*
* Copyright 2018,2019 David Hrdlička.
*/
#include <stdarg.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <initguid.h>
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#include <d2d1.h>
#include <d2d1helper.h>
#undef BITMAP
#define HAVE_STDARG_H
#include <86box/86box.h>
#include <86box/device.h>
#include <86box/video.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h>
#include <86box/ui.h>
#include <86box/win.h>
#include <86box/win_d2d.h>
static HWND d2d_hwnd, old_hwndMain;
static ID2D1Factory *d2d_factory;
static ID2D1HwndRenderTarget *d2d_target;
static ID2D1Bitmap *d2d_buffer;
static int d2d_width, d2d_height, d2d_screen_width,
d2d_screen_height, d2d_fs;
static volatile int d2d_enabled = 0;
/* Pointers to the real functions. */
static HRESULT WINAPI (*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 Direct2D DLL */
#ifdef ENABLE_D2D_LOG
int d2d_do_log = ENABLE_D2D_LOG;
static void
d2d_log(const char *fmt, ...)
{
va_list ap;
if (d2d_do_log) {
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
}
#else
#define d2d_log(fmt, ...)
#endif
static void
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)
{
case FULLSCR_SCALE_FULL:
*w = d2d_screen_width;
*h = d2d_screen_height;
*x = 0;
*y = 0;
break;
case FULLSCR_SCALE_43:
case FULLSCR_SCALE_KEEPRATIO:
dw = (double) d2d_screen_width;
dh = (double) d2d_screen_height;
hsr = dw / dh;
if (video_fullscreen_scale == FULLSCR_SCALE_43)
gsr = 4.0 / 3.0;
else
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;
case FULLSCR_SCALE_INT:
dw = (double) d2d_screen_width;
dh = (double) d2d_screen_height;
temp = ((double) *w);
temp2 = ((double) *h);
ratio_w = dw / ((double) *w);
ratio_h = dh / ((double) *h);
if (ratio_h < ratio_w)
{
ratio_w = ratio_h;
}
dx = (dw / 2.0) - ((temp * ratio_w) / 2.0);
dy = (dh / 2.0) - ((temp2 * ratio_h) / 2.0);
dw -= (dx * 2.0);
dh -= (dy * 2.0);
*w = (float) dw;
*h = (float) dh;
*x = (float) dx;
*y = (float) dy;
break;
}
}
static void
d2d_blit(int x, int y, int y1, int y2, int w, int h)
{
HRESULT hr = S_OK;
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;
}
if ((w != d2d_width || h != d2d_height) && !d2d_fs)
{
D2D1_SIZE_U size = { .width = w, .height = h };
hr = ID2D1HwndRenderTarget_Resize(d2d_target, &size);
if (SUCCEEDED(hr))
{
d2d_width = w;
d2d_height = h;
}
}
if (y1 == y2) {
video_blit_complete();
return;
}
if (render_buffer == NULL) {
video_blit_complete();
return;
}
/* Create a bitmap to store intermediate data */
if (d2d_buffer == NULL) {
if (SUCCEEDED(hr)) {
D2D1_SIZE_U size = {
.width = render_buffer->w,
.height = render_buffer->h };
D2D1_BITMAP_PROPERTIES bitmap_props = {
.pixelFormat = {
.format = DXGI_FORMAT_B8G8R8A8_UNORM,
.alphaMode = D2D1_ALPHA_MODE_IGNORE
},
.dpiX = 96.0f,
.dpiY = 96.0f
};
hr = ID2D1HwndRenderTarget_CreateBitmap(
d2d_target,
size,
NULL,
0,
&bitmap_props,
&d2d_buffer);
}
}
/* Copy data from render_buffer */
if (SUCCEEDED(hr)) {
D2D1_RECT_U rectU = {
.left = x,
.top = y + y1,
.right = x + w,
.bottom = y + y2
};
hr = ID2D1Bitmap_CopyFromMemory(
d2d_buffer,
&rectU,
&(render_buffer->line[y + y1][x]),
render_buffer->w << 2);
}
video_blit_complete();
/* Draw! */
if (SUCCEEDED(hr)) {
D2D1_RECT_F destRect;
ID2D1HwndRenderTarget_BeginDraw(d2d_target);
if (d2d_fs) {
float fs_x = 0, fs_y = 0, fs_w = 0, fs_h = 0;
D2D1_COLOR_F black = {
.r = 0.0, .g = 0.0, .b = 0.0, .a = 1.0 };
ID2D1HwndRenderTarget_Clear(
d2d_target,
&black
);
d2d_stretch(&fs_w, &fs_h, &fs_x, &fs_y);
destRect = (D2D1_RECT_F) {
.left = fs_x,
.top = fs_y,
.right = fs_x + fs_w,
.bottom = fs_y + fs_h
};
} else {
destRect = (D2D1_RECT_F) {
.left = 0,
.top = 0,
.right = w,
.bottom = h
};
}
D2D1_RECT_F srcRect = {
.left = x,
.top = y,
.right = x + w,
.bottom = y + h
};
ID2D1HwndRenderTarget_DrawBitmap(
d2d_target,
d2d_buffer,
&destRect,
1.0f,
D2D1_BITMAP_INTERPOLATION_MODE_LINEAR,
&srcRect);
hr = ID2D1HwndRenderTarget_EndDraw(d2d_target, NULL, NULL);
}
if (FAILED(hr))
{
d2d_log("Direct2D: d2d_blit: error 0x%08lx\n", hr);
}
}
void
d2d_close(void)
{
d2d_log("Direct2D: d2d_close()\n");
/* Unregister our renderer! */
video_setblit(NULL);
if (d2d_enabled)
d2d_enabled = 0;
if (d2d_buffer)
{
ID2D1Bitmap_Release(d2d_buffer);
d2d_buffer = NULL;
}
if (d2d_target)
{
ID2D1HwndRenderTarget_Release(d2d_target);
d2d_target = NULL;
}
if (d2d_factory)
{
ID2D1Factory_Release(d2d_factory);
d2d_factory = NULL;
}
if (d2d_hwnd)
{
hwndMain = old_hwndMain;
plat_set_input(hwndMain);
DestroyWindow(d2d_hwnd);
d2d_hwnd = NULL;
old_hwndMain = NULL;
}
/* Unload the DLL if possible. */
if (d2d_handle != NULL) {
dynld_close((void *)d2d_handle);
d2d_handle = NULL;
}
}
static int
d2d_init_common(int fs)
{
HRESULT hr = S_OK;
WCHAR title[200];
d2d_log("Direct2D: d2d_init_common(fs=%d)\n", fs);
d2d_handle = dynld_module("d2d1.dll", d2d_imports);
if (fs)
{
d2d_screen_width = GetSystemMetrics(SM_CXSCREEN);
d2d_screen_height = GetSystemMetrics(SM_CYSCREEN);
// Direct2D seems to lack any proper fullscreen mode,
// therefore we just create a full screen window
// and pass its handle to a HwndRenderTarget
mbstowcs(title, emu_version, sizeof_w(title));
d2d_hwnd = CreateWindow(
SUB_CLASS_NAME,
title,
WS_POPUP,
0, 0, d2d_screen_width, d2d_screen_height,
HWND_DESKTOP,
NULL,
hinstance,
NULL);
old_hwndMain = hwndMain;
hwndMain = d2d_hwnd;
plat_set_input(d2d_hwnd);
SetFocus(d2d_hwnd);
SetWindowPos(
d2d_hwnd, HWND_TOPMOST,
0, 0, d2d_screen_width, d2d_screen_height,
SWP_SHOWWINDOW);
}
hr = D2D1_CreateFactory(
D2D1_FACTORY_TYPE_MULTI_THREADED,
&IID_ID2D1Factory, NULL, (void **) &d2d_factory);
if (SUCCEEDED(hr))
{
D2D1_HWND_RENDER_TARGET_PROPERTIES hwnd_props;
if (fs)
{
hwnd_props = (D2D1_HWND_RENDER_TARGET_PROPERTIES) {
.hwnd = d2d_hwnd,
.pixelSize = {
.width = d2d_screen_width,
.height = d2d_screen_height
}
};
}
else
{
// HwndRenderTarget will get resized appropriately by d2d_blit,
// so it's fine to let D2D imply size of 0x0 for now
hwnd_props = (D2D1_HWND_RENDER_TARGET_PROPERTIES) {
.hwnd = hwndRender
};
}
D2D1_RENDER_TARGET_PROPERTIES target_props = { 0 };
hr = ID2D1Factory_CreateHwndRenderTarget(
d2d_factory, &target_props, &hwnd_props, &d2d_target);
}
if (SUCCEEDED(hr))
{
d2d_fs = fs;
d2d_width = 0;
d2d_height = 0;
// Make sure we get a clean exit.
atexit(d2d_close);
// Register our renderer!
video_setblit(d2d_blit);
}
if (FAILED(hr))
{
d2d_log("Direct2D: d2d_init_common: error 0x%08lx\n", hr);
d2d_close();
return(0);
}
d2d_enabled = 1;
return(1);
}
int
d2d_init(HWND h)
{
d2d_log("Direct2D: d2d_init(h=0x%08lx)\n", h);
return d2d_init_common(0);
}
int
d2d_init_fs(HWND h)
{
d2d_log("Direct2D: d2d_init_fs(h=0x%08lx)\n", h);
return d2d_init_common(1);
}
int
d2d_pause(void)
{
// Not implemented in any renderer. The heck is this even for?
d2d_log("Direct2D: d2d_pause()\n");
return(0);
}
void
d2d_enable(int enable)
{
d2d_enabled = enable;
}