Merge upstream Dolphin

CMake/ScmRevGen.cmake

@@ -33,7 +33,7 @@ endif()
 string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "2509")
+set(DOLPHIN_VERSION_MAJOR "2512")
 set(DOLPHIN_VERSION_MINOR "0")
 set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 

CMakeLists.txt

@@ -692,7 +692,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
 dolphin_find_optional_system_library_pkgconfig(ZLIB zlib>=1.3.1 ZLIB::ZLIB Externals/zlib-ng)
 
 dolphin_find_optional_system_library_pkgconfig(minizip-ng
-  "minizip-ng>=4.0.4" minizip-ng::minizip-ng Externals/minizip-ng
+  "minizip-ng>=4.0.4" MINIZIP::minizip-ng Externals/minizip-ng
 )
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
@@ -758,7 +758,7 @@ if(NOT ENABLE_QT)
   set(USE_MGBA 0)
 endif()
 if(USE_MGBA)
-  dolphin_find_optional_system_library(LIBMGBA Externals/mGBA)
+  dolphin_find_optional_system_library(LIBMGBA Externals/mGBA 0.11)
 endif()
 
 find_package(SYSTEMD)
@@ -788,7 +788,7 @@ endif()
 
 add_subdirectory(Externals/watcher)
 
-if(WIN32 OR LINUX)
+if(NOT ANDROID AND NOT APPLE)
   add_subdirectory(Externals/cpp-ipc)
 endif()
 

Data/Sys/GameSettings/GFP.ini

@@ -0,0 +1,5 @@
+# GFPEA4 - Frogger: Ancient Shadow
+
+[Video_Hacks]
+# Fixes dark graphical artifacts and pixel wide gap at the top and left edges of the screen.
+VertexRounding = True

Data/Sys/GameSettings/GJXP51.ini

@@ -0,0 +1,5 @@
+# GJXP51 - Vexx (PAL)
+
+[Core]
+# Prevent crash after completing the tutorial level
+MMU = True

Data/Sys/GameSettings/GL5.ini

@@ -1,7 +1,8 @@
-# GL5E4F - Lego GameCube
+# GL5X4F, GL5E4F, GL5P4F - Lego Star Wars: The Video Game
 
 [Core]
-# Values set here will override the main Dolphin settings.
+# Avoid crash when using the "Continue Story" option at the end of a level.
+CPUThread = False
 
 [OnFrame]
 # Add memory patches to be applied every frame here.

Data/Sys/GameSettings/GL7.ini

@@ -1,4 +1,4 @@
-# GL7E64, GL7P64 - StarWars Lego 2
+# GL7E64, GL7P64 - Lego Star Wars II: The Original Trilogy
 
 [Core]
 # Values set here will override the main Dolphin settings.

Data/Sys/GameSettings/GQN.ini

@@ -10,3 +10,8 @@ CPUThread = False
 
 [ActionReplay]
 # Add action replay cheats here.
+
+[Video_Hacks]
+# Fixes shadows at higher resolution.
+# Option has no effect at 1x IR, so no reason not to enable.
+VertexRounding = True

Data/Sys/GameSettings/GR2.ini

@@ -0,0 +1,5 @@
+# GR2P52, GR2JCQ, GR2E52 - Lost Kingdoms II
+
+[Video_Hacks]
+# Avoids consistent extraneous swaps that cause terrible pacing.
+CapImmediateXFB = True

Data/Sys/GameSettings/GST.ini

@@ -2,6 +2,8 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
+# Avoid crashes.
+CPUThread = False
 MemoryCardSize = 2
 
 [OnFrame]

Data/Sys/GameSettings/GXL.ini

@@ -0,0 +1,5 @@
+# GXLE52, GXLP52, GXLX52 - X-Men Legends
+
+[Video_Hacks]
+# Avoids constant black frame flickering.
+ImmediateXFBEnable = False

Data/Sys/GameSettings/GZ2.ini

@@ -10,8 +10,6 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-ImmediateXFBEnable = False
-
 # The game logic itself is ignoring VI interrupts 
 # and keeps updating shadow video registers.
 # Because of this, it is incompatible with VISkip.

Data/Sys/GameSettings/RZD.ini

@@ -10,7 +10,6 @@
 
 [Video_Hacks]
 EFBAccessEnable = True
-ImmediateXFBEnable = False
 
 # The game logic itself is ignoring VI interrupts 
 # and keeps updating shadow video registers.

Data/Sys/GameSettings/SAH.ini

@@ -0,0 +1,5 @@
+# SAHE69 - Hasbro Family Game Night: Fun Pack
+
+[Core]
+# Avoid opcode errors, which leave this title stuck on a black screen.
+CPUThread = False

Data/Sys/GameSettings/SDVE41.ini

@@ -0,0 +1,9 @@
+# SDVE41 - Driver: San Francisco
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+# This NOPs a branch that skips a VIWaitForRetrace.
+0x803b40b8:dword:0x60000000
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)

Data/Sys/GameSettings/SDVP41.ini

@@ -0,0 +1,9 @@
+# SDVP41 - Driver: San Francisco
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+# This NOPs a branch that skips a VIWaitForRetrace.
+0x803b2cdc:dword:0x60000000
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)

Data/Sys/GameSettings/SX4.ini

@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-ImmediateXFBEnable = False
+# Makes the uncapped "Reading Disc" screen not unbearably slow.
+CapImmediateXFB = True

Data/Sys/Load/GraphicMods/The Legend of Zelda Twilight Princess GC/metadata.json

@@ -0,0 +1,23 @@
+{
+	"meta":
+	{
+		"title": "Bloom Texture Definitions",
+		"author": "iwubcode"
+	},
+	"groups":
+	[
+		{
+			"name": "Bloom",
+			"targets": [
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n41_76x56_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n42_152x112_6"
+				}
+			]
+		}
+	]
+}

Data/Sys/Resources/OSD_Font_VeraMono_Copyright.txt

@@ -0,0 +1,124 @@
+Bitstream Vera Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as
+long as "Bitstream" or "Vera" are not in the names), and full
+redistribution (so long as they are not *sold* by themselves). They
+can be be bundled, redistributed and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright
+=========
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
+Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the
+"Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font
+Software without prior written authorization from the Gnome Foundation
+or Bitstream Inc., respectively. For further information, contact:
+fonts at gnome dot org.
+
+Copyright FAQ
+=============
+
+   1. I don't understand the resale restriction... What gives?
+
+      Bitstream is giving away these fonts, but wishes to ensure its
+      competitors can't just drop the fonts as is into a font sale system
+      and sell them as is. It seems fair that if Bitstream can't make money
+      from the Bitstream Vera fonts, their competitors should not be able to
+      do so either. You can sell the fonts as part of any software package,
+      however.
+
+   2. I want to package these fonts separately for distribution and
+      sale as part of a larger software package or system.  Can I do so?
+
+      Yes. A RPM or Debian package is a "larger software package" to begin 
+      with, and you aren't selling them independently by themselves. 
+      See 1. above.
+
+   3. Are derivative works allowed?
+      Yes!
+
+   4. Can I change or add to the font(s)?
+      Yes, but you must change the name(s) of the font(s).
+
+   5. Under what terms are derivative works allowed?
+
+      You must change the name(s) of the fonts. This is to ensure the
+      quality of the fonts, both to protect Bitstream and Gnome. We want to
+      ensure that if an application has opened a font specifically of these
+      names, it gets what it expects (though of course, using fontconfig,
+      substitutions could still could have occurred during font
+      opening). You must include the Bitstream copyright. Additional
+      copyrights can be added, as per copyright law. Happy Font Hacking!
+
+   6. If I have improvements for Bitstream Vera, is it possible they might get 
+       adopted in future versions?
+
+      Yes. The contract between the Gnome Foundation and Bitstream has
+      provisions for working with Bitstream to ensure quality additions to
+      the Bitstream Vera font family. Please contact us if you have such
+      additions. Note, that in general, we will want such additions for the
+      entire family, not just a single font, and that you'll have to keep
+      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
+      glyphs to the font, they must be stylistically in keeping with Vera's
+      design. Vera cannot become a "ransom note" font. Jim Lyles will be
+      providing a document describing the design elements used in Vera, as a
+      guide and aid for people interested in contributing to Vera.
+
+   7. I want to sell a software package that uses these fonts: Can I do so?
+
+      Sure. Bundle the fonts with your software and sell your software
+      with the fonts. That is the intent of the copyright.
+
+   8. If applications have built the names "Bitstream Vera" into them, 
+      can I override this somehow to use fonts of my choosing?
+
+      This depends on exact details of the software. Most open source
+      systems and software (e.g., Gnome, KDE, etc.) are now converting to
+      use fontconfig (see www.fontconfig.org) to handle font configuration,
+      selection and substitution; it has provisions for overriding font
+      names and subsituting alternatives. An example is provided by the
+      supplied local.conf file, which chooses the family Bitstream Vera for
+      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
+      core server) has other mechanisms for font substitution.
+

Data/Sys/Shaders/default_pre_post_process.glsl

@@ -11,9 +11,9 @@ mat3 from_NTSCM = transpose(mat3(
 
 // ARIB TR-B9 (9300K+27MPCD with chromatic adaptation) (NTSC-J) -> BT.709
 mat3 from_NTSCJ = transpose(mat3(
-	0.823613036967492,		-0.0943227111084757,	0.00799341532931119,
-	0.0289258355537324,		1.02310733489462,			0.00243547111576797,
-	-0.00569501554980891,	0.0161828357559315,		1.22328453915712));
+	0.768497526,		-0.210804164,	  0.000297427177,
+	0.0397904068,		1.04825413,			0.00555809540,
+	0.00147510506,	0.0328789241,		1.36515128));
 
 // EBU - BT.470BG/BT.601 (PAL) -> BT.709
 mat3 from_PAL = transpose(mat3(

Externals/SDL/CMakeLists.txt

@@ -8,14 +8,12 @@ set(SDL_INSTALL_TESTS OFF)
 set(SDL_UNIX_CONSOLE_BUILD ON)
 
 set(SDL_AUDIO OFF)
-if (NOT APPLE)
-  # Working around cocoa/SDL_tray.m linker errors.
-  set(SDL_VIDEO OFF)
-endif()
+set(SDL_VIDEO OFF)
 set(SDL_GPU OFF)
 set(SDL_RENDER OFF)
 set(SDL_CAMERA OFF)
 set(SDL_DIALOG OFF)
+set(SDL_TRAY OFF)
 
 add_subdirectory(SDL)