From: Toni Wilen Date: Sun, 10 Jul 2022 17:10:45 +0000 (+0300) Subject: Remove obsolete lines X-Git-Tag: 41000~204 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3ebca23fc3a29d2aa79614540a17c87de1090e32;p=francis%2Fwinuae.git Remove obsolete lines --- diff --git a/od-win32/render.h b/od-win32/render.h index e77b819f..364650d3 100644 --- a/od-win32/render.h +++ b/od-win32/render.h @@ -2,48 +2,11 @@ #define __DXWRAP_H__ #include "rtgmodes.h" -#include #include #include #define MAX_DISPLAYS 10 -extern int ddforceram; -extern int useoverlay; - -struct ddstuff -{ - int ddinit; - int ddzeroguid; - GUID ddguid; - LPDIRECTDRAW7 maindd; - LPDIRECTDRAWCLIPPER dclip; - LPDIRECTDRAWSURFACE7 primary, secondary, flipping[2]; - DDOVERLAYFX overlayfx; - DWORD overlayflags; - int fsmodeset, backbuffers; - int width, height, depth, freq; - int vblank_skip, vblank_skip_cnt; - int swidth, sheight; - DDSURFACEDESC2 native; - DDSURFACEDESC2 locksurface; - int lockcnt; - DWORD pitch; - HWND hwnd; - uae_u32 colorkey; - int islost, isoverlay; - - LPDIRECTDRAWSURFACE7 statussurface; -}; -struct ddcaps -{ - int maxwidth, maxheight; - int cancolorkey; - int cannonlocalvidmem; -}; -extern struct ddstuff dxdata; -extern struct ddcaps dxcaps; - struct ScreenResolution { uae_u32 width; /* in pixels */ diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 2e672fdd..ee03e219 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -19,7 +19,6 @@ #define IDS_CPU 12 #define IDS_CHIPSET 13 #define IDS_INPUT 14 -#define IDS_OPENGL 15 #define IDS_FILTER 15 #define IDS_MISC2 16 #define IDS_PATHS 17 @@ -132,7 +131,6 @@ #define IDI_AVIOUTPUT 158 #define IDS_ERRORTITLE 159 #define IDS_SELECTFILESYSROOT 160 -#define IDD_OPENGL 160 #define IDD_FILTER 160 #define IDS_DEFAULTMIDIOUT 161 #define IDS_DEFAULTMIDIIN 162 @@ -1225,7 +1223,6 @@ #define IDC_INPUTMAPLIST 1797 #define IDC_RTG_HWSPRITE 1797 #define IDC_PORT1_REMAP 1798 -#define IDC_RTG_SCALE_ALLOW2 1798 #define IDC_RTG_CENTER 1798 #define IDC_PORT0_REMAP 1799 #define IDC_RTG_Z2Z4 1799 diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp index 5b2e2f5b..aa2c2d7e 100644 --- a/od-win32/screenshot.cpp +++ b/od-win32/screenshot.cpp @@ -784,7 +784,7 @@ static int filenumber = 0; static int dirnumber = 1; /* -Captures the Amiga display (GDI, D3D or OpenGL) surface and saves it to file as a 24bit bitmap. +Captures the Amiga display (GDI, D3D) surface and saves it to file as a 24bit bitmap. */ int screenshotf(int monid, const TCHAR *spath, int mode, int doprepare, int imagemode, struct vidbuffer *vb) {