Merge 9d92b8708a into 4528441c74

for OGL renderer W buffer rendering avoid undefined vertex z
see https://github.com/melonDS-emu/melonDS/issues/2017
2024-11-14 13:27:41 -07:00 · 2024-11-10 07:56:41 +00:00 · 2024-11-09 14:19:02 +01:00 · 2024-11-09 08:32:34 +01:00 · 2024-11-08 21:41:27 +00:00 · 2024-11-08 21:32:45 +00:00
4 changed files with 8 additions and 4 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -12,7 +12,7 @@
     * 22.04: `sudo apt install qtbase6-dev qtbase6-private-dev qtmultimedia6-dev libqt6svg6-dev`
     * Older versions: `sudo apt install qtbase5-dev qtbase5-private-dev qtmultimedia5-dev libqt5svg5-dev`  
       Also add `-DUSE_QT6=OFF` to the first CMake command below.
-   * Fedora: `sudo dnf install gcc-c++ cmake extra-cmake-modules SDL2-devel libarchive-devel enet-devel libzstd-devel qt6-{qtbase,qtmultimedia,qtsvg}-devel wayland-devel`
+   * Fedora: `sudo dnf install gcc-c++ cmake extra-cmake-modules SDL2-devel libarchive-devel enet-devel libzstd-devel qt6-{qtbase,qtbase-private,qtmultimedia,qtsvg}-devel wayland-devel`
   * Arch Linux: `sudo pacman -S base-devel cmake extra-cmake-modules git libpcap sdl2 qt6-{base,multimedia,svg} libarchive enet zstd`
 2. Download the melonDS repository and prepare:
   ```bash
@ -40,7 +40,7 @@
 5. Install dependencies:  
   Replace `<prefix>` below with `mingw-w64-ucrt-x86_64` on x64 systems, or `mingw-w64-clang-aarch64` on ARM64 systems.
   ```bash
-   pacman -S <prefix>-{toolchain,cmake,SDL2,libarchive,enet,zstd}`
+   pacman -S <prefix>-{toolchain,cmake,SDL2,libarchive,enet,zstd}
   ```
 6. Install Qt and configure the build directory
   * Dynamic builds (with DLLs)
--- a/src/GPU3D_OpenGL_shaders.h
+++ b/src/GPU3D_OpenGL_shaders.h
@ -681,6 +681,7 @@ void main()

    vec4 fpos;
    fpos.xy = (((vec2(vPosition.xy) ) * 2.0) / uScreenSize) - 1.0;
+    fpos.z = 0.0;
    fZ = float(vPosition.z << zshift) / 16777216.0;
    fpos.w = float(vPosition.w) / 65536.0f;
    fpos.xy *= fpos.w;
--- a/src/debug/GdbProto.cpp
+++ b/src/debug/GdbProto.cpp
@ -113,7 +113,7 @@ Gdb::ReadResult GdbStub::ParseAndSetupPacket()
 	ReadResult result, prevResult;
 	while (true)
 	{
-		ReadResult result = TryParsePacket(i, packetStart, packetSize, packetContentSize);
+		result = TryParsePacket(i, packetStart, packetSize, packetContentSize);
 		if (result == ReadResult::NoPacket)
 			break;
 		if (result != ReadResult::CmdRecvd && result != ReadResult::Break)
--- a/src/frontend/qt_sdl/AboutDialog.ui
+++ b/src/frontend/qt_sdl/AboutDialog.ui
@ -133,6 +133,9 @@
         <property name="text">
          <string>By Arisotura, the melonDS team &lt;a href=&quot;https://github.com/melonDS-emu/melonDS/graphs/contributors&quot;&gt;and contributors&lt;/a&gt;.</string>
         </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
        </widget>
       </item>
       <item>
Author	SHA1	Message	Date
Jakly	7fdd98c718	Merge `9d92b8708a` into `4528441c74`	2024-11-10 07:56:41 +00:00
RSDuck	4528441c74	for OGL renderer W buffer rendering avoid undefined vertex z Some checks failed macOS / ${{ matrix.arch }} (arm64) (push) Has been cancelled Details macOS / ${{ matrix.arch }} (x86_64) (push) Has been cancelled Details Ubuntu / x86_64 (push) Has been cancelled Details Ubuntu / aarch64 (push) Has been cancelled Details Windows / build (push) Has been cancelled Details macOS / Universal binary (push) Has been cancelled Details see https://github.com/melonDS-emu/melonDS/issues/2017	2024-11-09 14:19:02 +01:00
Nadia Holmquist Pedersen	8e3f6cc519	add missing qtbase-private-devel for Fedora Some checks are pending macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run Details macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run Details macOS / Universal binary (push) Blocked by required conditions Details Ubuntu / x86_64 (push) Waiting to run Details Ubuntu / aarch64 (push) Waiting to run Details Windows / build (push) Waiting to run Details	2024-11-09 08:32:34 +01:00
Rayyan Ansari	7041b52ebc	Remove extra backtick in Windows build instructions Some checks are pending macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run Details macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run Details macOS / Universal binary (push) Blocked by required conditions Details Ubuntu / x86_64 (push) Waiting to run Details Ubuntu / aarch64 (push) Waiting to run Details Windows / build (push) Waiting to run Details	2024-11-08 21:41:27 +00:00
Rayyan Ansari	adf143a38d	Fix link to contributors in About dialog Add openExternalLinks property to the label to allow the hyperlink to open in the user's web browser.	2024-11-08 21:32:45 +00:00
RSDuck	8d4f419546	correct assert in gdb stub	2024-11-08 18:57:44 +01:00