Merge 'master' into shader-uids-awesome.

Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp

CMakeLists.txt

@@ -7,7 +7,8 @@ option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
-option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
+option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
+option(USE_GLES3 "Enables GLES3 and EGL" OFF)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
 option(FASTLOG "Enable all logs" OFF)
@@ -84,11 +85,11 @@ endfunction(enable_precompiled_headers)
 include(FindGit OPTIONAL)
 if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 # defines DOLPHIN_WC_REVISION
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
 	OUTPUT_VARIABLE DOLPHIN_WC_REVISION
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 # defines DOLPHIN_WC_DESCRIBE
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
 	OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -96,7 +97,7 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
 
 # defines DOLPHIN_WC_BRANCH
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
 	OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
@@ -261,11 +262,19 @@ endif()
 
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
-if(USE_GLES)
-	message("GLES rendering enabled")
-	add_definitions(-DUSE_GLES=1)
-	add_definitions(-DUSE_EGL=1)
+if(USE_GLES3)
+	message("GLES3 rendering enabled")
+	add_definitions(-DUSE_GLES=1 -DUSE_EGL=1 -DUSE_GLES3=1)
+	include_directories(Externals/GLES3)
 	set(USE_EGL True)
+	set(USE_GLES True)
+else()
+	if(USE_GLES)
+		message("GLES2 rendering enabled. OpenGL disabled")
+		add_definitions(-DUSE_GLES=1)
+		add_definitions(-DUSE_EGL=1)
+		set(USE_EGL True)
+	endif()
 endif()
 # For now Wayland and EGL are tied to each other.
 # The alternative would be an shm path
@@ -595,7 +604,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
 				${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION
@@ -610,7 +619,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	endif(wxWidgets_FOUND)
 		
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
 				${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION

Data/User/GameConfig/GHMD4F.ini

@@ -0,0 +1,16 @@
+# GHMD4F - Hitman 2: Silent Assassin
+[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.
+EmulationIssues = 
+EmulationStateId = 5
+[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/GHME4F.ini

@@ -30,3 +30,11 @@ $Press Left + Y For Nailgun
 52889D30 00000801
 0406D250 418201BC
 0406D288 408000C4
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHMF4F.ini

@@ -0,0 +1,16 @@
+# GHMF4F - Hitman 2: Silent Assassin
+[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.
+EmulationIssues = 
+EmulationStateId = 5
+[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/GHMP4F.ini

@@ -0,0 +1,16 @@
+# GHMP4F - Hitman 2: Silent Assassin
+[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.
+EmulationIssues = 
+EmulationStateId = 5
+[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/GJXP51.ini

@@ -0,0 +1,18 @@
+# GJXP51 - Vexx
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Slow because it needs mmu to run.
+[OnFrame]
+[ActionReplay]
+[Gecko]
+[Video_Settings]
+
+
+[Core]

Data/User/GameConfig/GOWD69.ini

@@ -0,0 +1,16 @@
+# GOWD69 - NFS Most Wanted
+[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 = Videos are messed up, skip them.
+[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/GOWE69.ini

@@ -1,7 +1,16 @@
 # GOWE69 - NFS Most Wanted
 [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 = Some GFX Glitches And may be slow.
+EmulationIssues = Videos are messed up, skip them.
 [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/GOWF69.ini

@@ -0,0 +1,16 @@
+# GOWF69 - NFS Most Wanted
+[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 = Videos are messed up, skip them.
+[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/GOWJ69.ini

@@ -0,0 +1,16 @@
+# GOWJ69 - NFS Most Wanted
+[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 = Videos are messed up, skip them.
+[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/GOWP69.ini

@@ -0,0 +1,16 @@
+# GOWP69 - NFS Most Wanted
+[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 = Videos are messed up, skip them.
+[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/GWLX6L.ini

@@ -1,8 +1,10 @@
 # GWLX6L - Project Zoo
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = Unespecified codes,report to devs
+EmulationStateId = 4
+EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
++$Bypass FIFO reset
+0x8028EE80:dword:0x48000638
 [ActionReplay] Add action replay cheats here.

Data/User/GameConfig/GX2P52.ini

@@ -0,0 +1,18 @@
+# GX2P52 - X-Men Legends 2: Rise of Apocalypse
+[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 = 3
+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_Enhancements]
+

Data/User/GameConfig/GX3P41.ini

@@ -4,7 +4,7 @@ TLBHack = 1
 MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to show up (r6906)
+EmulationIssues = Needs real xfb for the videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GX3X41.ini

@@ -0,0 +1,21 @@
+# GX3X41 - XIII
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+MMU = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+[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_Settings]
+UseXFB = True
+UseRealXFB = True
+

Data/User/GameConfig/JAAE01.ini

@@ -1,8 +1,17 @@
-# JAAE01 - Super Mario World 
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = No Sound
-EmulationStateId = 4
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
+# JAAE01 - Super Mario World 
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[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_Settings]
+SafeTextureCacheColorSamples = 512

Data/User/GameConfig/SB3E08.ini

@@ -1,7 +1,7 @@
 # SB3E08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.

Data/User/GameConfig/SB3J08.ini

@@ -1,7 +1,7 @@
 # SB3J08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.

Data/User/GameConfig/SB3P08.ini

@@ -1,7 +1,7 @@
 # SB3P08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.

Data/User/GameConfig/SLWE41.ini

@@ -0,0 +1,18 @@
+# SLWE41 - Where's Waldo? The Fantastic Journey
+[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 = Needs Real Xfb for the pointer to appear.
+[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_Settings]
+UseXFB = True
+UseRealXFB = True