Permalink
Browse files

Merge pull request #491 from fzurita/GLideN64_oct_20

video-gliden64: Update to commit 34fa719.
  • Loading branch information...
Gillou68310 committed Oct 20, 2015
2 parents 2a496cf + 8c32918 commit 35f3db5a83c3e243c7c6983f4234b259e6355050
@@ -1,14 +1,14 @@
; Custom game settings
[General]
-version=4
+version=5
[TWINE]
Good_Name=007 - The World Is Not Enough (E)(U)
frameBufferEmulation\N64DepthCompare=1
[1080%20SNOWBOARDING]
Good_Name=1080 Snowboarding (E)(JU)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[6D120CBF]
@@ -31,24 +31,24 @@ Good_Name=Bakushou Jinsei 64 - Mezase! Resort Ou (J)
[BANJO-KAZOOIE]
Good_Name=Banjo-Kazooie (E)(U) / Banjo To Kazooie No Daibouken (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[BANJO%20KAZOOIE%202]
Good_Name=Banjo to Kazooie no Daibouken 2 (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[BANJO%20TOOIE]
Good_Name=Banjo-Tooie (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[BEETLE%20ADVENTURE%20RAC]
Good_Name=Beetle Adventure Racing (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[BEETLE%20ADVENTURE%20JP]
Good_Name=Beetle Adventure Racing (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[BIOFREAKS]
@@ -72,7 +72,7 @@ Good_Name=Choro Q 64 2 - Hacha Mecha Grand Prix Race (J)
[CASTLEVANIA]
Good_Name=Castlevania (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[CASTLEVANIA2]
Good_Name=Castlevania - Legacy Of Darkness (E)(U)
@@ -86,33 +86,34 @@ Good_Name=Chou Snobow Kids (J)
[CONKER%20BFD]
Good_Name=Conker's Bad Fur Day (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[362D06B6]
Good_Name=Densha de Go! 64 (J)
[DONALD%20DUCK%20GOIN%27%20QU]
Good_Name=Donald Duck - Goin' Quackers (U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
frameBufferEmulation\copyDepthToRDRAM=1
[DONALD%20DUCK%20QUACK%20AT]
Good_Name=Donald Duck - Quack Attack (E)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
frameBufferEmulation\copyDepthToRDRAM=1
[DONKEY%20KONG%2064]
Good_Name=Donkey Kong 64 (E)(J)(U)
-frameBufferEmulation\copyToRDRAM=1
+; set to 1 for correct HUD in pause menu
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
frameBufferEmulation\copyDepthToRDRAM=1
[D%20K%20DISPLAY]
Good_Name=Donkey Kong 64 Kiosk Demo (U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
frameBufferEmulation\copyDepthToRDRAM=1
@@ -156,7 +157,7 @@ frameBufferEmulation\copyToRDRAM=1
[F-ZERO%20X]
Good_Name=F-Zero X (E)(J)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[18000458]
Good_Name=Famista 64 (J)
@@ -179,6 +180,7 @@ frameBufferEmulation\N64DepthCompare=1
[5CFA0A2E]
Good_Name=Heiwa Pachinko World 64 (J)
+frameBufferEmulation\copyToRDRAM=1
[HEXEN]
Good_Name=Hexen (E)(F)(G)(J)(U)
@@ -190,7 +192,7 @@ Good_Name=Hiryuu No Ken Twin (J)
[HSV%20ADVENTURE%20RACING]
Good_Name=HSV Adventure Racing (A)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[83CA0DCA]
@@ -223,7 +225,7 @@ Good_Name=Kiratto Kaiketsu! 64 Tanteidan (J)
[LEGORACERS]
Good_Name=Lego Racers (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
[76910A78]
@@ -235,36 +237,37 @@ frameBufferEmulation\N64DepthCompare=1
[MARIOGOLF64]
Good_Name=Mario Golf (E)(J)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[MARIOKART64]
Good_Name=Mario Kart 64 (E)(J)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[2B6D07C8]
Good_Name=Mario No Photopi (J)
[MARIO%20STORY]
Good_Name=Mario Story (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[MARIOTENNIS]
Good_Name=Mario Tennis (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[MARIOTENNIS64]
Good_Name=Mario Tennis 64 (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[MICKEY%20USA%20PAL]
Good_Name=Mickey's Speedway USA (E)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyDepthToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[MICKEY%20USA]
Good_Name=Mickey's Speedway USA (U) / Mickey No Racing Challenge USA (J)
-frameBufferEmulation\copyToRDRAM=1
frameBufferEmulation\copyDepthToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[293D0695]
Good_Name=Morita Shougi 64 (J)
@@ -281,15 +284,15 @@ Good_Name=Nushi Duri 64 - Shiokaze Ni Notte (J)
[PAPER%20MARIO]
Good_Name=Paper Mario (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
[PENNY%20RACERS]
Good_Name=Penny Racers (E)(U)
frameBufferEmulation\copyToRDRAM=0
[PERFECT%20DARK]
Good_Name=Perfect Dark (E)(J)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[PUZZLE%20LEAGUE%20N64]
@@ -304,9 +307,14 @@ frameBufferEmulation\copyToRDRAM=0
Good_Name=Pokemon Stadium Kin Gin (J)
frameBufferEmulation\copyToRDRAM=0
+[QUAKE%20II]
+Good_Name=Quake II (U)
+; set to 1 for correct HUD in pause menu
+frameBufferEmulation\copyToRDRAM=2
+
[RAYMAN%202]
Good_Name=Rayman 2 - The Great Escape (E)(U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\detectCFB=1
[RESIDENT%20EVIL%20II]
@@ -356,12 +364,12 @@ frameBufferEmulation\copyDepthToRDRAM=1
[ZELDA%20MAJORA%27S%20MASK]
Good_Name=The Legend Of Zelda - Majora's Mask (E)(U) / Zelda No Densetsu - Mujura No Karmen (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[MAJORA%27S%20MASK]
Good_Name=The Legend Of Zelda - Majora's Mask Demo (U)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[THE%20LEGEND%20OF%20ZELDA]
@@ -380,6 +388,7 @@ frameBufferEmulation\N64DepthCompare=1
[TONIC%20TROUBLE]
Good_Name=Tonic Trouble (E)(U)
+frameBufferEmulation\copyToRDRAM=1
frameBufferEmulation\detectCFB=1
[48460A35]
@@ -400,7 +409,7 @@ Good_Name=WWF Wrestlemania 2000 (J)
[THE%20MASK%20OF%20MUJURA]
Good_Name=Zelda No Densetsu - Mujura No Karmen (J)
-frameBufferEmulation\copyToRDRAM=1
+frameBufferEmulation\copyToRDRAM=2
frameBufferEmulation\copyDepthToRDRAM=1
[7BC50D43]
@@ -1,5 +1,5 @@
[General]
-version=4
+version=5
[video]
fullscreenWidth=640
@@ -24,7 +24,7 @@ enableCustomSettings=1
[frameBufferEmulation]
enable=1
-copyToRDRAM=1
+copyToRDRAM=2
copyDepthToRDRAM=0
copyFromRDRAM=0
detectCFB=0
@@ -366,7 +366,7 @@ Storage format:
uint32 - number of shaders
shaders in binary form
*/
-static const u32 CombinersCacheFormatVersion = 0x02U;
+static const u32 ShaderStorageFormatVersion = 0x03U; // Shaders changed after rev. c6d37ca
void CombinerInfo::_saveShadersStorage() const
{
if (m_shadersLoaded >= m_combiners.size())
@@ -385,7 +385,7 @@ void CombinerInfo::_saveShadersStorage() const
if (!fout)
return;
- fout.write((char*)&CombinersCacheFormatVersion, sizeof(CombinersCacheFormatVersion));
+ fout.write((char*)&ShaderStorageFormatVersion, sizeof(ShaderStorageFormatVersion));
const u32 optionsSet = _getConfigOptionsBitSet();
fout.write((char*)&optionsSet, sizeof(optionsSet));
@@ -426,7 +426,7 @@ bool CombinerInfo::_loadShadersStorage()
try {
u32 version;
fin.read((char*)&version, sizeof(version));
- if (version != CombinersCacheFormatVersion)
+ if (version != ShaderStorageFormatVersion)
return false;
u32 optionsSet;
@@ -49,7 +49,7 @@ void Config::resetToDefaults()
#endif
frameBufferEmulation.copyDepthToRDRAM = ctDisable;
frameBufferEmulation.copyFromRDRAM = 0;
- frameBufferEmulation.copyToRDRAM = ctSync;
+ frameBufferEmulation.copyToRDRAM = ctAsync;
frameBufferEmulation.detectCFB = 0;
frameBufferEmulation.N64DepthCompare = 0;
frameBufferEmulation.aspect = 1;
@@ -26,7 +26,7 @@ DepthBuffer::DepthBuffer() : m_address(0), m_width(0), m_uly(0), m_lry(0),
DepthBuffer::DepthBuffer(DepthBuffer && _other) :
m_address(_other.m_address), m_width(_other.m_width), m_uly(_other.m_uly), m_lry(_other.m_lry),
m_FBO(_other.m_FBO), m_pDepthImageTexture(_other.m_pDepthImageTexture), m_pDepthBufferTexture(_other.m_pDepthBufferTexture),
- m_pResolveDepthBufferTexture(_other.m_pResolveDepthBufferTexture), m_resolved(_other.m_resolved)
+ m_cleared(_other.m_cleared), m_pResolveDepthBufferTexture(_other.m_pResolveDepthBufferTexture), m_resolved(_other.m_resolved)
{
_other.m_FBO = 0;
_other.m_pDepthImageTexture = NULL;
@@ -93,9 +93,13 @@ DepthBufferToRDRAM g_dbToRDRAM;
#endif
RDRAMtoFrameBuffer g_RDRAMtoFB;
-FrameBuffer::FrameBuffer() : m_validityChecked(0), m_cleared(false), m_fingerprint(false), m_changed(false), m_isDepthBuffer(false),
- m_needHeightCorrection(false), m_postProcessed(false), m_pLoadTile(NULL), m_pDepthBuffer(NULL),
- m_pResolveTexture(NULL), m_resolveFBO(0), m_copiedToRdram(false), m_resolved(false)
+FrameBuffer::FrameBuffer() :
+ m_startAddress(0), m_endAddress(0), m_size(0), m_width(0), m_height(0), m_fillcolor(0), m_validityChecked(0),
+ m_scaleX(0), m_scaleY(0),
+ m_copiedToRdram(false), m_fingerprint(false), m_cleared(false), m_changed(false), m_cfb(false),
+ m_isDepthBuffer(false), m_isPauseScreen(false), m_isOBScreen(false), m_needHeightCorrection(false),
+ m_postProcessed(false), m_pLoadTile(NULL),
+ m_pDepthBuffer(NULL), m_pResolveTexture(NULL), m_resolveFBO(0), m_resolved(false)
{
m_pTexture = textureCache().addFrameBufferTexture();
glGenFramebuffers(1, &m_FBO);
@@ -104,8 +108,8 @@ FrameBuffer::FrameBuffer() : m_validityChecked(0), m_cleared(false), m_fingerpri
FrameBuffer::FrameBuffer(FrameBuffer && _other) :
m_startAddress(_other.m_startAddress), m_endAddress(_other.m_endAddress),
m_size(_other.m_size), m_width(_other.m_width), m_height(_other.m_height), m_fillcolor(_other.m_fillcolor),
- m_scaleX(_other.m_scaleX), m_scaleY(_other.m_scaleY), m_cleared(_other.m_cleared), m_fingerprint(_other.m_fingerprint), m_changed(_other.m_changed), m_cfb(_other.m_cfb), m_isDepthBuffer(_other.m_isDepthBuffer),
- m_copiedToRdram(_other.m_copiedToRdram), m_needHeightCorrection(_other.m_needHeightCorrection), m_postProcessed(_other.m_postProcessed), m_validityChecked(_other.m_validityChecked),
+ m_validityChecked(_other.m_validityChecked), m_scaleX(_other.m_scaleX), m_scaleY(_other.m_scaleY), m_copiedToRdram(_other.m_copiedToRdram), m_fingerprint(_other.m_fingerprint), m_cleared(_other.m_cleared), m_changed(_other.m_changed),
+ m_cfb(_other.m_cfb), m_isDepthBuffer(_other.m_isDepthBuffer), m_isPauseScreen(_other.m_isPauseScreen), m_isOBScreen(_other.m_isOBScreen), m_needHeightCorrection(_other.m_needHeightCorrection), m_postProcessed(_other.m_postProcessed),
m_FBO(_other.m_FBO), m_pLoadTile(_other.m_pLoadTile), m_pTexture(_other.m_pTexture), m_pDepthBuffer(_other.m_pDepthBuffer),
m_pResolveTexture(_other.m_pResolveTexture), m_resolveFBO(_other.m_resolveFBO), m_resolved(_other.m_resolved), m_RdramCopy(_other.m_RdramCopy)
{
@@ -283,7 +287,7 @@ void FrameBuffer::copyRdram()
bool FrameBuffer::isValid() const
{
- if (m_validityChecked == RSP.DList)
+ if (m_validityChecked == video().getBuffersSwapCount())
return true; // Already checked
const u32 * const pData = (const u32*)RDRAM;
Oops, something went wrong.

0 comments on commit 35f3db5

Please sign in to comment.