Skip to content

Commit be7a642

Browse files
committed
vmdisp fix / release attempt 2
1 parent c8d73e1 commit be7a642

4 files changed

Lines changed: 24 additions & 17 deletions

File tree

actions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ linerRule_t infFixRules[] = {
11541154
{";3dfx:", FALSE, TRUE, setLine3DFX},
11551155
{"mesa3d.dll=1", TRUE, TRUE, setMesaAlternate},
11561156
{"vmwsgl32.dll=1", TRUE, TRUE, setMesaAlternate},
1157-
{"mesa98.dll=1", TRUE, TRUE, setMesaAlternate},
1157+
{"mesa89.dll=1", TRUE, TRUE, setMesaAlternate},
11581158
{"mesa99.dll=1", TRUE, TRUE, setMesaAlternate},
11591159
{NULL, FALSE, FALSE, NULL}
11601160
};

config.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ NOTE: you can enter numeric values as DWORD or as string, it'll be converted aut
8383
| VRAMLimit | 128 | Maximum video RAM (in MB) exposed to system, allow to use adapters when have more then 256 MB VRAM, VRAM is usually utilized only by frame buffers, 32 MB is usually enough for FullHD resolution (1920 x 1080).
8484
| MTRR | 1 | Allow to use Intel MTRR registry to accelerate CPU to VRAM operations |
8585
| DosWindowSetMode | 0 | Allow to DOS application to call set mode when DOS application is in window mode |
86+
| HWDoubleBuffer | 2 | 0 - double buffering is fully emulated,
87+
| | | 1 - allow frame buffer swap (if supported),
88+
| | | 2 - allow frame buffer swap during vertical retrace (if supported).
89+
| NoMemTest | 0 | when 1 disable video memory testing. Some GPUs may have some I/O in linear frame buffer space and overwrite this memory can confuse the device. |
8690

8791

8892
### DosWindowSetMode
@@ -131,23 +135,26 @@ These keys have same names and behaviour like [Mesa Environment Variables](https
131135

132136
## OpenGlide
133137

134-
"Disabled"="1"
135-
"FogEnable"="1"
136-
"InitFullScreen"="0"
137-
"Textures32bit"="1"
138-
"HideCursor"="2"
139-
"NoSplash"="0"
140-
"SwapInterval"="0"
141-
"Resolution"="2"
142-
143-
"NumTMU"="2"
144-
"SSTType="3"
145-
"TextureMemorySize"="4"
146-
"FrameBufferMemorySize"="4"
138+
| Name | Default | Description |
139+
| ---- | ------- | ----------- |
140+
| Disabled | 0 |
141+
| FogEnable | 0 |
142+
| InitFullScreen | 0 |
143+
| Textures32bit | 0 |
144+
| HideCursor | 1 |
145+
| NoSplash | 0 |
146+
| SwapInterval | 0 |
147+
| Resolution | 1 |
148+
| NumTMU | 1 |
149+
| SSTType | 1 |
150+
| TextureMemorySize | 4 |
151+
| FrameBufferMemorySize | 4 |
147152

148153

149154
## WINE
150155

156+
157+
151158
"VideoMemorySize"="256"
152159

153160
## Examples

softgpu.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ws2path=redist\ws2setup.exe
3434
;ie98=redist\ie6setup\ie6setup.exe
3535
;ie98.ver=Internet Explorer 6.0
3636
default_profile=7
37-
default_path=C:\drivers\SG25.52
37+
default_path=C:\drivers\SG25.53
3838
mesa_alt=mesa25
3939
settings_level=50
4040
warn=This is release preview, make sure you save all your data (eg. created VM snaphot).
@@ -189,7 +189,7 @@ error=1
189189
desc=ISA VGA or PCI VGA without PCI bus detected, this can't work! Please check Device manager before continue!
190190
191191
[version]
192-
vmdisp9x=1.2025.0.118
192+
vmdisp9x=1.2025.0.119
193193
mesa9x_main=23.1.9.138
194194
mesa9x_alt=25.1.6.138
195195
wine9x=1.7.55.45

windrv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ const char *device_ini_get(vga_device_t *dev, const char *property)
258258
}
259259
else if(s_class)
260260
{
261-
uint16_t class_id = strtoul(s_class, NULL, 0);
261+
uint32_t class_id = strtoul(s_class, NULL, 0);
262262
if(class_id == dev->pci.cc)
263263
{
264264
return iniSectionsValue("[pci]", i, property);

0 commit comments

Comments
 (0)