stability release

Author: JHRobotics

actions.c

@@ -1130,32 +1130,22 @@ BOOL set_inf_regs(HWND hwnd)
 		registryWriteInf("HKLM\\Software\\D9Switcher\\global", "nine", WINREG_STR, dstfile);
 	else
 		registryWriteInf("HKLM\\Software\\D9Switcher\\global", "wine", WINREG_STR, dstfile);
+
+	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\NoMultisample", settingReadDW(CHBX_NO_MULTISAMPLE), dstfile);
+	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\AsyncMOBs",     settingReadDW(INP_ASYNCMOBS), dstfile);
+
+	registryWriteInfDWORD("HKLM\\Software\\Mesa3d\\SVGA_GMR_CACHE_ENABLED",        settingReadDW(CHBX_GMR_CACHE),   dstfile);
 
-	DWORD stoptions = 0;
-	if(isSettingSet(CHBX_ST_16))
-	{
-		stoptions |= 0x1;
-	}
-	
-	if(isSettingSet(CHBX_ST_MOUSE))
-	{
-		stoptions |= 0x2;
-	}
-	
-	if(isSettingSet(CHBX_ST_MOUSE_HIDE))
+	if(settingReadDW(IMP_SVGA_MEM_MAX) != 400)
 	{
-		stoptions |= 0x4;
+		registryWriteInfDWORD("HKLM\\Software\\Mesa3D\\global\\SVGA_MEM_MAX",        settingReadDW(IMP_SVGA_MEM_MAX), dstfile);
 	}
 
-	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\STSize", settingReadDW(INP_SCREENTARGET), dstfile);
-	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\STOptions", stoptions, dstfile);
-	
-	registryWriteInfDWORD("HKLM\\Software\\Mesa3D\\global\\SVGA_BLIT_SURF_TO_SCREEN", settingReadDW(CHBX_BLIT_SURF),       dstfile);
-	registryWriteInfDWORD("HKLM\\Software\\Mesa3D\\global\\SVGA_DMA_NEED_REREAD",     settingReadDW(CHBX_DMA_NEED_REREAD), dstfile);
-	
-	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\NoMultisample", settingReadDW(CHBX_NO_MULTISAMPLE), dstfile);
-	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\AsyncMOBs",     settingReadDW(INP_ASYNCMOBS), dstfile);
-	
+	registryWriteInfDWORD("HKLM\\Software\\Mesa3D\\global\\MESA_SW_GAMMA_ENABLED", settingReadDW(CHBX_SW_GAMMA),    dstfile);
+	registryWriteInfDWORD("HKLM\\Software\\Mesa3D\\global\\SVGA_DMA_TO_FB",        settingReadDW(CHBX_DMA_TO_FB),   dstfile);
+
+	registryWriteInfDWORD("HKLM\\Software\\VMWSVGA\\HWCursor",                     settingReadDW(CHBX_HWCURSOR),    dstfile);
+
 	return TRUE;
 }
 

changelog.txt

@@ -1,3 +1,10 @@
+0.6.2024.39
+! stability fixes
+! double buffering support (or emulation)
+! Hires <-> VGA mode switching correctly
+- Gamma support (disabled by default)
+- Increased compatibility list
+
 0.6.2024.38
 ! no hard wired modes on DDHAL (1280x800 didn't work for example)
 ! no unknown control to DIP (causes BSOD)

settings.c

@@ -35,6 +35,7 @@
 
 #define ST_DEF 0
 #define VRAM_DEF 128
+#define SVGA_MEM_MAX 400
 #define DEFAULT_INST_PATH "C:\\drivers\\softgpu"
 
 #define T_CHECKBOX  1
@@ -85,17 +86,16 @@ static const settings_item_t settings_def[] =
 	{LBX_PROFILE,          T_DROPDOWN,  24, "profile",  0, NULL, NULL, 0, 0},
 	{INP_PATH,             T_INPUT_STR, 25, "path",     0, DEFAULT_INST_PATH, NULL, 0, 0},
 	{INP_VRAM_LIMIT,       T_INPUT_NUM, 26, "vram",     VRAM_DEF, NULL, NULL, 0, 0},
-	{INP_SCREENTARGET,     T_INPUT_NUM, 27, "screentarget_mb",    ST_DEF, NULL, NULL, 0, 0},
-	{CHBX_ST_16,           T_CHECKBOX,  28, "screentarget_16bpp", 0, NULL, NULL, 0, 0},
-	{CHBX_ST_MOUSE,        T_CHECKBOX,  29, "screentarget_mouse", 0, NULL, NULL, 0, 0},
-	{CHBX_ST_MOUSE_HIDE,   T_CHECKBOX,  30, "screentarget_mouse_hide", 0, NULL, NULL, 0, 0},
 	{CHBX_DOTCOM,          T_CHECKBOX,  31, "dotcom",   0, NULL, NULL, 0, 0},
 	{CHBX_WS2,             T_CHECKBOX,  32, "ws2",      0, NULL, NULL, 0, 0},
-	{CHBX_BLIT_SURF,       T_CHECKBOX,  33, "blit_surf", 0, NULL, NULL, 0, 0},
-	{CHBX_DMA_NEED_REREAD, T_CHECKBOX,  34, "dma_need_reread", 1, NULL, NULL, 0, 0},
-	{CHBX_MESA_DOWNGRADE,  T_CHECKBOX,  35, "mesa_downgrade",  1, NULL, NULL, 0, 0},
 	{CHBX_NO_MULTISAMPLE,  T_CHECKBOX,  36, "no_multisample",  0, NULL, NULL, 0, 0},
 	{INP_ASYNCMOBS,        T_INPUT_NUM, 37, "asyncmobs", 1, NULL, NULL, 0, 0},
+	{CHBX_GMR_CACHE,       T_CHECKBOX,  38, "gmrcache",  0, NULL, NULL, 0, 0},
+	{IMP_SVGA_MEM_MAX,     T_INPUT_NUM, 39, "svgamemmax", SVGA_MEM_MAX, NULL, NULL, 0, 0},
+	{CHBX_SW_GAMMA,        T_CHECKBOX,  40, "swgamma",   0, NULL, NULL, 0, 0},
+	{CHBX_DMA_TO_FB,       T_CHECKBOX,  41, "dmatofb",   0, NULL, NULL, 0, 0},
+	{CHBX_HWCURSOR,        T_CHECKBOX,  42, "hwcursor",  0, NULL, NULL, 0, 0},
+	{CHBX_MESA_DOWNGRADE,  T_CHECKBOX,  43, "mesa_downgrade",  0, NULL, NULL, 0, 0},
 	{0,                    0,            0, NULL,        0, NULL, NULL, 0, 0}
 };
 

softgpu.h

@@ -92,21 +92,27 @@
 
 #define BTN_CUSTOM 40
 
-#define INP_SCREENTARGET 41
-#define CHBX_ST_16 42
-#define CHBX_ST_MOUSE 43
-#define CHBX_ST_MOUSE_HIDE 44
+//#define INP_SCREENTARGET 41
+//#define CHBX_ST_16 42
+//#define CHBX_ST_MOUSE 43
+//#define CHBX_ST_MOUSE_HIDE 44
 
 #define CHBX_DOTCOM  45
 #define CHBX_WS2     46
 
-#define CHBX_BLIT_SURF 47
-#define CHBX_DMA_NEED_REREAD 48
+//#define CHBX_BLIT_SURF 47
+//#define CHBX_DMA_NEED_REREAD 48
 
 #define CHBX_MESA_DOWNGRADE 49
 #define CHBX_NO_MULTISAMPLE 50
 #define INP_ASYNCMOBS 51
 
+#define CHBX_GMR_CACHE   52
+#define IMP_SVGA_MEM_MAX 53
+#define CHBX_SW_GAMMA    54
+#define CHBX_DMA_TO_FB   55
+#define CHBX_HWCURSOR    56
+
 BOOL isSettingSet(DWORD menu);
 void writeSettings();
 int intSettings(int type);

softgpu.ini

@@ -36,7 +36,7 @@ ws2path=redist\ws2setup.exe
 default_profile=6
 default_path=C:\drivers\SG24.38
 mesa_alt=mesa23
-settings_level=36
+;settings_level=36
 
 [defaults]
 dxflags=0
@@ -53,6 +53,9 @@ dma_need_reread=1
 mesa_downgrade=0
 no_multisample=0
 asyncmobs=1
+hwcursor=0
+dmatofb=0
+gmrcache=0
 
 [profile]
 name=QEMU (software 3D only)
@@ -70,34 +73,40 @@ name=VirtualBox 6.1.0 - 6.1.46
 rgb565=1
 blit_surf=1
 dxflags=1
+dmatofb=1
 
 [profile]
 name=VirtualBox 6.1.48 - 6.1.50
 dxflags=1
 blit_surf=1
+dmatofb=1
 
 [profile]
 name=VirtualBox 7.0.0 - 7.0.14
 dxflags=1
 rgb565=1
 blit_surf=1
+dmatofb=1
 
 [profile]
 name=VirtualBox 7.0.16 and newer
 blit_surf=1
+dmatofb=1
 
 [profile]
 name=VMware Workstation (compatible)
 blit_surf=0
 dma_need_reread=0
 mesa_downgrade=1
 no_multisample=1
+hwcursor=1
 
 [profile]
 name=VMware Workstation (vGPU10 only)
 blit_surf=0
 dma_need_reread=0
 no_multisample=1
+hwcursor=1
 
 [pci]
 name=VirtualBox VGA
@@ -151,10 +160,10 @@ error=1
 desc=ISA VGA or PCI VGA without PCI bus detected, this can't work! Please check Device manager before continue!
 
 [version]
-vmdisp9x=1.2024.0.75
-mesa9x_main=24.1.5.108
-mesa9x_alt=23.1.9.108
-wine9x=1.7.55.38
+vmdisp9x=1.2024.0.87
+mesa9x_main=24.1.5.114
+mesa9x_alt=23.1.9.114
+wine9x=1.7.55.40
 openglide9x=0.1.2024.17
 simd95=1.0.0.0
 
@@ -184,6 +193,8 @@ HKLM\Software\DDSwitcher\gta_sa.exe;system
 HKLM\Software\DDSwitcher\3DMark03.exe;system
 HKLM\Software\DDSwitcher\3DMark2001.exe;system
 HKLM\Software\DDSwitcher\3DMark2001SE.exe;system
+HKLM\Software\DDSwitcher\Carm95.exe;system
+HKLM\Software\DDSwitcher\HCopter.exe;system
 HKLM\Software\OpenGlide\Hitman.exe\NumTMU;2
 HKLM\Software\OpenGlide\u9.icd\HideCursor;2
 HKLM\Software\OpenGlide\u9.exe\HideCursor;2
@@ -204,3 +215,5 @@ HKLM\Software\DDSwitcher\empires.exe;system
 HKLM\Software\DDSwitcher\heroes3.exe;system
 HKLM\Software\DDSwitcher\Oni.exe;system
 HKLM\Software\Mesa3D\Oni.exe\MESA_EXTENSION_MAX_YEAR;2001
+HKLM\Software\Mesa3D\xtremecr.exe\MESA_EXTENSION_MAX_YEAR;2004
+HKLM\Software\Mesa3D\litecr.exe\MESA_EXTENSION_MAX_YEAR;2004

window.c

@@ -334,41 +334,41 @@ void softgpu_cur_window_create(HWND hwnd, LPARAM lParam)
 	DRAW_DIRECTION_DOWN;
 
 	LABEL(0, CUST_WIDTH, LINE_HEIGHT, "SVGA settings", 0);
+
+	CHECKBOX(CHBX_DMA_TO_FB,           CUST_WIDTH,   LINE_HEIGHT, "DMA surface to framebuffer (VB)");
+	CHECKBOX(CHBX_HWCURSOR,            CUST_WIDTH,   LINE_HEIGHT, "HW cursor (VMW, in VB bugged)");
+
+	CHECKBOX(CHBX_BUG_DX_FLAGS,        CUST_WIDTH,   LINE_HEIGHT, "DX flags (VB <= 7.0.14)");
+	CHECKBOX(CHBX_BUG_PREFER_FIFO,     CUST_WIDTH,   LINE_HEIGHT, "Prefer FIFO (VME)");
+	CHECKBOX(CHBX_BUG_RGB565,          CUST_WIDTH,   LINE_HEIGHT, "RGB565 (VB < 7.0.10, < 6.1.46)");
+
+	CHECKBOX(CHBX_MESA_DOWNGRADE,      CUST_WIDTH,   LINE_HEIGHT, "Downgrade Mesa3D (VMW vGPU9)");
+
+	CHECKBOX(CHBX_NO_MULTISAMPLE,      CUST_WIDTH,   LINE_HEIGHT, "Disable multisample (VMW)");
+
+	draw_y += LINE_HEIGHT;
 
-	CHECKBOX(CHBX_BLIT_SURF,           CUST_WIDTH,   LINE_HEIGHT, "Blit surface to screen (VBox)");
-	CHECKBOX(CHBX_DMA_NEED_REREAD,     CUST_WIDTH,   LINE_HEIGHT, "DMA need reread (VBox)");
-	
-	CHECKBOX(CHBX_BUG_DX_FLAGS,        CUST_WIDTH,   LINE_HEIGHT, "DX flags (VBox <= 7.0.14)");
-	CHECKBOX(CHBX_BUG_PREFER_FIFO,     CUST_WIDTH,   LINE_HEIGHT, "Prefer FIFO (VMware)");
-	CHECKBOX(CHBX_BUG_RGB565,          CUST_WIDTH,   LINE_HEIGHT, "RGB565 (VBox < 7.0.10, < 6.1.46)");
-	
-	CHECKBOX(CHBX_MESA_DOWNGRADE,      CUST_WIDTH,   LINE_HEIGHT, "Downgrade Mesa3D (VMware)");
-	
-	CHECKBOX(CHBX_NO_MULTISAMPLE,      CUST_WIDTH,   LINE_HEIGHT, "Disable multisample (VMware)");
-	
+	LABEL(0, CUST_WIDTH, LINE_HEIGHT, "Experimental settings", 0);
+//	draw_y += LINE_HL;
+
 	DRAW_DIRECTION_RIGHT;
 	LABEL(0,             200, LINE_HEIGHT, "Async MOBs: ", 0);
 	INPUT(INP_ASYNCMOBS,  50, LINE_HEIGHT, "", 0);
-	draw_x = DRAW_START_X;
 	draw_y += LINE_HEIGHT;
+	draw_x = DRAW_START_X;
 	DRAW_DIRECTION_DOWN;
-	
-	draw_y += LINE_HL;
-	
-	LABEL(0, CUST_WIDTH, LINE_HEIGHT, "SVGA screen target (experimental)", 0);
-	
+
+	CHECKBOX(CHBX_GMR_CACHE,           CUST_WIDTH,   LINE_HEIGHT, "GMR cache (vGPU9, inefficient)");
+	CHECKBOX(CHBX_SW_GAMMA,            CUST_WIDTH,   LINE_HEIGHT, "Enable gamma globaly (slow)");
+
 	DRAW_DIRECTION_RIGHT;
-	
-	LABEL(0,               200, LINE_HEIGHT, "Screen target surface (MB): ", 0);
-	INPUT(INP_SCREENTARGET, 50, LINE_HEIGHT, "", 0);
-	
+	LABEL(0,             200, LINE_HEIGHT, "SVGA RAM limit (MB): ", 0);
+	INPUT(IMP_SVGA_MEM_MAX,  50, LINE_HEIGHT, "", 0);
 	draw_x = DRAW_START_X;
 	draw_y += LINE_HEIGHT;
 	DRAW_DIRECTION_DOWN;
 
-	CHECKBOX(CHBX_ST_16,    CUST_WIDTH, LINE_HEIGHT, "Screen target for 16bpp");
-	CHECKBOX(CHBX_ST_MOUSE, CUST_WIDTH, LINE_HEIGHT, "Screen target accelerated mouse");
-	CHECKBOX(CHBX_ST_MOUSE_HIDE, CUST_WIDTH, LINE_HEIGHT, "Screen target mouse hide");
-	
+	//LABEL(0,             200, LINE_HEIGHT, "VB = VirtualBox, VMW = WMware Workstation ", 0);
+
 	settingsApply(hwnd);
 }