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

Merge pull request #157 from MoochMcGee/experimental

Browse Source 
Update RIVA 128 emulation and allow dev branch to be compiled from mainline 86Box.
This commit is contained in:
OBattler
2017-07-27 21:51:49 +02:00
committed by GitHub
parent ddedef1a8a d3adc13445
commit 5dae8a4562
4 changed files with 310 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

570
src/VIDEO/vid_nv_riva128.c
View File

File diff suppressed because it is too large Load Diff

4
src/VIDEO/video.c
View File

@@ -93,6 +93,10 @@ static VIDEO_CARD video_cards[] =
{"MDA", "mda", &mda_device, GFX_MDA},
{"MDSI Genius", "genius", &genius_device, GFX_GENIUS},
{"Number Nine 9FX (S3 Trio64)", "n9_9fx", &s3_9fx_device, GFX_N9_9FX},
#ifdef DEV_BRANCH
{"nVidia RIVA 128", "riva128", &riva128_device, GFX_RIVA128},
{"nVidia RIVA TNT", "rivatnt", &rivatnt_device, GFX_RIVATNT},
#endif
{"OAK OTI-067", "oti067", &oti067_device, GFX_OTI067},
{"OAK OTI-077", "oti077", &oti077_device, GFX_OTI077},
{"Paradise Bahamas 64 (S3 Vision864)", "bahamas64", &s3_bahamas64_device, GFX_BAHAMAS64},