Merge branch 'immediate-removal' into GLSL-master

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging

.gitignore

@@ -35,4 +35,5 @@ Source/Core/Common/Src/scmrev.h
 *.ipch
 .sconsign.dblite
 Externals/scons-local/*
+.DS_Store
 *~

CMakeLists.txt

@@ -289,7 +289,7 @@ else()
 	message("bluez NOT found, disabling bluetooth support")
 endif(BLUEZ_FOUND)
 
-check_lib(PULSEAUDIO libpulse QUIET)
+check_lib(PULSEAUDIO libpulse-simple QUIET)
 if(PULSEAUDIO_FOUND)
 	add_definitions(-DHAVE_PULSEAUDIO=1)
 	message("PulseAudio found, enabling PulseAudio sound backend")
@@ -405,6 +405,19 @@ else()
 	set(LZO lzo2)
 endif()
 
+if(OPENAL_FOUND)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+		check_lib(SOUNDTOUCH SoundTouch soundtouch/soundtouch.h QUIET)
+	endif()
+	if (SOUNDTOUCH_FOUND)
+		message("Using shared soundtouch")
+	else()
+		message("Using static soundtouch from Externals")
+		add_subdirectory(Externals/soundtouch)
+		include_directories(Externals)
+	endif()
+endif()
+
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	include(FindSDL2 OPTIONAL)
 endif()
@@ -613,6 +626,13 @@ endif()
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
 	install(FILES Data/license.txt DESTINATION ${datadir})
 endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	# Install the application icon and menu item
+	install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm)
+	install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif()
 
 # packaging information
 set(CPACK_PACKAGE_NAME "dolphin-emu")

Data/User/GameConfig/G2RE52.ini

@@ -0,0 +1,16 @@
+# G2RE52 - Shrek SuperSlam
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G5SE7D.ini

@@ -0,0 +1,18 @@
+# G5SE7D - Spyro
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs efb to Ram for proper lighting.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/G5SP7D.ini

@@ -0,0 +1,18 @@
+# G5SP7D - Spyro
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = Needs efb to Ram for proper lighting.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/GP5E01.ini

@@ -2,7 +2,7 @@
 [EmuState]
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-Issues="Some graphical bugs"
+EmulationIssues = 
 [OnLoad]
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
@@ -381,3 +381,14 @@ $Press L+X: Player Stops Moving
 0022A392 00000001
 00000000 40000000
 [Core]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/User/GameConfig/GP5J01.ini

@@ -0,0 +1,21 @@
+# GP5J01 - Mario Party 5
+[EmuState]
+#The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+#Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Core]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/User/GameConfig/GP5P01.ini

@@ -0,0 +1,21 @@
+# GP5P01 - Mario Party 5
+[EmuState]
+#The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnLoad]
+#Add memory patches to be loaded once on boot here.
+[OnFrame]
+[ActionReplay]
+[Core]
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBCopyEnable = True
+EFBToTextureEnable = False

Data/User/GameConfig/GVLD69.ini

@@ -0,0 +1,17 @@
+# GVLD69 - Marvel Nemesis: Rise of the Imperfects
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GVLE69.ini

@@ -1,7 +1,17 @@
 # GVLE69 - Marvel Nemesis: Rise of the Imperfects
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
+SkipIdle = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GVLF69.ini

@@ -0,0 +1,17 @@
+# GVLF69 - Marvel Nemesis: Rise of the Imperfects
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GVLP69.ini

@@ -0,0 +1,17 @@
+# GVLE69 - Marvel Nemesis: Rise of the Imperfects
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+SkipIdle = 0
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them. Idleskipping if enabled will cause speed issues.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/R6BE78.ini

@@ -1,8 +1,8 @@
-# R6BE78 - Blob07
+# R6BE78 - de Blob
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Some GFX Glitches
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,4 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 ForceFiltering = False
-
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/R6BJ78.ini

@@ -1,8 +1,8 @@
 # R6BJ78 - Blob Colorful Na Kibou
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Some GFX Glitches
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,3 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 ForceFiltering = False
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/R6BK78.ini

@@ -1,8 +1,8 @@
-# R6BK78 - Blob07
+# R6BK78 - de Blob
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Some GFX Glitches
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,3 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 ForceFiltering = False
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/R6BP78.ini

@@ -1,8 +1,8 @@
-# R6BP78 - Blob07
+# R6BP78 - de Blob
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Some GFX Glitches
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,3 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 ForceFiltering = False
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/R6BX78.ini

@@ -1,8 +1,8 @@
-# R6BX78 - Blob07
+# R6BX78 - de Blob
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Some GFX Glitches
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -15,3 +15,6 @@ PH_ZFar =
 [Gecko]
 [Video_Enhancements]
 ForceFiltering = False
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/SDBE78.ini

@@ -0,0 +1,18 @@
+# SDBE78 - de Blob 2
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True

Data/User/GameConfig/SDBP78.ini

@@ -0,0 +1,18 @@
+# SDBP78 - de Blob 2
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True