git subrepo clone --force ../GLideN64

subrepo: subdir: "GLideN64" merged: "7317e1728" upstream: origin: "../GLideN64" branch: "develop" commit: "7317e1728" git-subrepo: version: "0.4.0" origin: "???" commit: "???"
libretro · Aug 30, 2022 · 0623234 · 0623234
1 parent 29717c0
commit 0623234
Show file tree

Hide file tree

Showing 74 changed files with 3,217 additions and 597 deletions.
diff --git a/GLideN64/.gitrepo b/GLideN64/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = [email protected]:libretro/GLideN64.git
 	branch = develop
-	commit = e788beac12888bb06cfff8834550f03d59f2158b
-	parent = bcfef7fee1e8bac3eab28e7ab368693e1625bd55
+	commit = 7317e1728ef31a0cd4833056947af272739ff02a
+	parent = 29717c0b6e1be8c7b46dbd2801a275a72208ffea
 	method = rebase
 	cmdver = 0.4.0
diff --git a/GLideN64/README.md b/GLideN64/README.md
@@ -1,16 +1,46 @@
-GLideN64
-========
 
-A new generation, open-source graphics plugin for N64 emulators.
+# GLideN64 [![Github Badge]][Workflow]
 
-Latest build status for master branch:
-[![GLideN64](https://github.com/gonetz/GLideN64/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/gonetz/GLideN64/actions?query=branch%3Amaster)
+*A next generation* ***Graphics Plugin*** *for* ***N64*** *emulators.*
 
-To get Continuous Integration (CI) builds for mupen64plus and zilmar-spec emulators: 
-* if you have a Github account, log in and click the build status icon, then click on the latest CI run.
-* if you don't have a Github account, download the latest build from [the `github-actions` release.](https://github.com/gonetz/GLideN64/releases/tag/github-actions)
+---
 
-Choose the between the 32-bit and 64-bit version depending on your emulator version.
-If you want to download an earlier build, log into Github and click the status icon.
+## Continuous Integration
 
-CI builds have the latest features and fixes, and are generally stable, but may introduce bugs and have incomplete translations.
+**CI** builds have the latest `features` / `fixes` , are generally <br>
+stable, but may introduce **bugs** and have *incomplete translations* .
+
+<br>
+
+To obtain **CI** builds for the `mupen64plus` & <br>
+`zilmar-spec` emulators do the following :
+
+##### With Github
+
+Download them from the latest **[Workflow]** .
+
+##### Without Github
+
+Download them from the latest **[Release]** .
+
+<br>
+
+##### Version
+
+*Choose between `32-bit` / `64-bit`* <br>
+*according to your emulator version.*
+
+##### Earlier Builds
+
+*For earlier builds you will have to log in and <br>
+download them from an older* ***[Workflow]*** *.*
+
+
+<!----------------------------------------------------------------------------->
+
+[Wiki]: https://github.com/gonetz/GLideN64/wiki
+
+[Release]: https://github.com/gonetz/GLideN64/releases/tag/github-actions
+[Workflow]: https://github.com/gonetz/GLideN64/actions?query=branch%3Amaster
+
+[Github Badge]: https://github.com/gonetz/GLideN64/actions/workflows/build.yml/badge.svg?branch=master
diff --git a/GLideN64/ini/GLideN64.custom.ini b/GLideN64/ini/GLideN64.custom.ini
@@ -19,6 +19,14 @@ frameBufferEmulation\copyFromRDRAM=1
 frameBufferEmulation\copyToRDRAM=0
 frameBufferEmulation\copyDepthToRDRAM=0
 
+[362D06B6]
+Good_Name=Densha de Go! 64 (J)
+generalEmulation\enableLegacyBlending=0
+
+[68D128AE]
+GoodName=Densha de Go! 64 (J) (Localization Patch v1.01)
+generalEmulation\enableLegacyBlending=0
+
 [52150A67]
 Good_Name=Bokujou Monogatari 2 (J)
 frameBufferEmulation\N64DepthCompare=1
@@ -121,12 +129,14 @@ frameBufferEmulation\N64DepthCompare=1
 Good_Name=Jet Force Gemini (E)(U)
 frameBufferEmulation\fbInfoDisabled=0
 frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
 
 [J%20F%20G%20DISPLAY]
 ; See Jet Force Gemini for notes
 Good_Name=Jet Force Gemini Kiosk Demo (U)
 frameBufferEmulation\fbInfoDisabled=0
 frameBufferEmulation\copyAuxToRDRAM=1
+frameBufferEmulation\copyToRDRAM=0
 
 [J%20WORLD%20SOCCER3]
 frameBufferEmulation\N64DepthCompare=1

diff --git a/GLideN64/projects/cmake/Readme.txt b/GLideN64/projects/cmake/Readme.txt
@@ -11,5 +11,9 @@ cmake [-DCMAKE_BUILD_TYPE=Debug] [-DVEC4_OPT=On] [-DCRC_OPT=On] [-DX86_OPT=On] [
 -DNOHQ=On - optional parameter. set to build without realtime texture enhancer library (GLideNHQ).
 -DUSE_SYSTEM_LIBS=On - optional parameter. set to use system provided libraries for libpng and zlib.
 -DMUPENPLUSAPI=On - required parameter. currently cmake build works only for mupen64plus version of the plugin.
+-MUPENPLUSAPI_GLIDENUI=On - optional parameter. set it if you need GLideNUI for Mupen64Plus
 -DODROID=On - set if you need to build on an Odroid board.
 -DVERO4K=On - set if you need to build on the OSMC Vero4k.
+-DANDROID=On - set if targeting an Android device
+-DMESA=On - set to disable Raspberry Pi autodetection
+-DGL_PROFILE=On - set to turn on GL profiling
diff --git a/GLideN64/src/BufferCopy/ColorBufferToRDRAM.cpp b/GLideN64/src/BufferCopy/ColorBufferToRDRAM.cpp
@@ -41,7 +41,7 @@ void ColorBufferToRDRAM::destroy() {
 
 bool ColorBufferToRDRAM::_prepareCopy(u32& _startAddress)
 {
-	if (VI.width == 0 || frameBufferList().getCurrent() == nullptr)
+	if (VI.width == 0)
 		return false;
 
 	FrameBuffer * pBuffer = frameBufferList().findBuffer(_startAddress);
@@ -236,7 +236,7 @@ void ColorBufferToRDRAM::copyToRDRAM(u32 _address, bool _sync)
 		return;
 	if (!_prepareCopy(_address))
 		return;
-	if (config.frameBufferEmulation.copyToRDRAM == Config::CopyToRDRAM::ctDisable)
+	if (config.frameBufferEmulation.copyToRDRAM == Config::CopyToRDRAM::ctDisable && config.frameBufferEmulation.fbInfoDisabled != 0)
 		return;
 
 	const u32 numBytes = (m_pCurFrameBuffer->m_width*m_pCurFrameBuffer->m_height) << m_pCurFrameBuffer->m_size >> 1;

diff --git a/GLideN64/src/Config.cpp b/GLideN64/src/Config.cpp
@@ -21,12 +21,15 @@ void Config::resetToDefaults()
 	video.fullscreen = 0;
 	video.fullscreenWidth = video.windowedWidth = 640;
 #endif
+	video.borderless = 0u;
 	video.fullscreenHeight = video.windowedHeight = 480;
 	video.fullscreenRefresh = 60;
 	video.fxaa = 0;
 	video.multisampling = 0;
 	video.maxMultiSampling = 0;
 	video.verticalSync = 0;
+	video.deviceName[0] = L'\0';
+
 	video.threadedVideo = 0;
 
 	texture.anisotropy = 0;
@@ -95,6 +98,7 @@ void Config::resetToDefaults()
 	textureFilter.txForce16bpp = 0;
 	textureFilter.txCacheCompression = 1;
 	textureFilter.txSaveCache = 1;
+	textureFilter.txDump = 0;
 
 	textureFilter.txEnhancedTextureFileStorage = 0;
 	textureFilter.txHiresTextureFileStorage = 0;
@@ -197,6 +201,8 @@ const char* Config::hotkeyIniName(u32 _idx)
 		return "hkOsdRenderingResolution";
 	case Config::HotKey::hkForceGammaCorrection:
 		return "hkForceGammaCorrection";
+	case Config::HotKey::hkInaccurateTexCords:
+		return "hkInaccurateTexCords";
 	}
 	return nullptr;
 }
@@ -233,6 +239,8 @@ const char* Config::enabledHotkeyIniName(u32 _idx)
 		return "hkOsdRenderingResolutionEnabled";
 	case Config::HotKey::hkForceGammaCorrection:
 		return "hkForceGammaCorrectionEnabled";
+	case Config::HotKey::hkInaccurateTexCords:
+		return "hkInaccurateTexCordsEnabled";
 	}
 	return nullptr;
 }

diff --git a/GLideN64/src/Config.h b/GLideN64/src/Config.h
@@ -23,12 +23,14 @@ struct Config
 	struct
 	{
 		u32 fullscreen;
+		u32 borderless;
 		u32 windowedWidth, windowedHeight;
 		u32 fullscreenWidth, fullscreenHeight, fullscreenRefresh;
 		u32 fxaa;
 		u32 multisampling, maxMultiSampling;
 		u32 verticalSync;
 		u32 threadedVideo;
+		wchar_t deviceName[32];
 	} video;
 
 	struct
@@ -173,6 +175,7 @@ struct Config
 		u32 txForce16bpp;				// Force use 16bit color textures
 		u32 txCacheCompression;			// Zip textures cache
 		u32 txSaveCache;				// Save texture cache to hard disk
+		u32 txDump;                     // Dump textures
 
 		u32 txEnhancedTextureFileStorage;	// Use file storage instead of memory cache for enhanced textures.
 		u32 txHiresTextureFileStorage;		// Use file storage instead of memory cache for hires textures.
@@ -234,6 +237,7 @@ struct Config
 		hkOsdInternalResolution,
 		hkOsdRenderingResolution,
 		hkForceGammaCorrection,
+		hkInaccurateTexCords,
 		hkTotal
 	};
 

diff --git a/GLideN64/src/DisplayWindow.cpp b/GLideN64/src/DisplayWindow.cpp
@@ -8,10 +8,6 @@
 #include "PluginAPI.h"
 #include "FrameBuffer.h"
 
-#ifdef min
-#undef min
-#endif
-
 bool DisplayWindow::start()
 {
 	if (!_start())

diff --git a/GLideN64/src/FrameBuffer.cpp b/GLideN64/src/FrameBuffer.cpp
@@ -143,7 +143,7 @@ void FrameBuffer::_setAndAttachTexture(ObjectHandle _fbo, CachedTexture *_pTextu
 
 bool FrameBuffer::isAuxiliary() const
 {
-	return m_width != VI.width;
+	return m_width != VI.width || m_size < G_IM_SIZ_16b;
 }
 
 void FrameBuffer::init(u32 _address, u16 _format, u16 _size, u16 _width, bool _cfb)
@@ -1006,7 +1006,7 @@ void FrameBufferList::attachDepthBuffer()
 	if (pCurrent == nullptr)
 		return;
 
-	DepthBuffer * pDepthBuffer = depthBufferList().getCurrent();
+	DepthBuffer * pDepthBuffer = pCurrent->m_isDepthBuffer ? depthBufferList().findBuffer(pCurrent->m_startAddress) : depthBufferList().getCurrent();
 
 	if (pCurrent->m_FBO.isNotNull() && pDepthBuffer != nullptr) {
 		pDepthBuffer->initDepthImageTexture(pCurrent);

diff --git a/GLideN64/src/GBI.cpp b/GLideN64/src/GBI.cpp
@@ -147,6 +147,7 @@ GBIInfo GBI;
 void GBI_Unknown( u32 w0, u32 w1 )
 {
 	DebugMsg(DEBUG_NORMAL, "UNKNOWN GBI COMMAND 0x%02X", _SHIFTR(w0, 24, 8));
+	LOG(LOG_ERROR, "UNKNOWN GBI COMMAND 0x%02X", _SHIFTR(w0, 24, 8));
 }
 
 void GBIInfo::init()