izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into GLSL-master

Browse Source 
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
This commit is contained in:
degasus
2012-12-27 10:36:54 +01:00
parent 53398ca5d8 94116bf89c
commit 316a33d1e6
316 changed files with 27897 additions and 22577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -35,3 +35,4 @@ Source/Core/Common/Src/scmrev.h
*.ipch
.sconsign.dblite
Externals/scons-local/*
*~
CMakeLists.txt
+19 -6
View File
@@ -86,7 +86,7 @@ endif()
# version number
set(DOLPHIN_VERSION_MAJOR "3")
set(DOLPHIN_VERSION_MINOR "0")
set(DOLPHIN_VERSION_MINOR "5")
if(DOLPHIN_IS_STABLE)
set(DOLPHIN_VERSION_PATCH "0")
else()
@@ -178,6 +178,10 @@ if(APPLE)
# page on x86_64 is 4GB in size.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-pagezero_size,0x1000")
if(NOT DISABLE_WX)
add_definitions(-DUSE_WX -DHAVE_WX)
set(USE_WX TRUE)
endif()
find_library(APPKIT_LIBRARY AppKit)
find_library(APPSERV_LIBRARY ApplicationServices)
find_library(ATB_LIBRARY AudioToolbox)
@@ -218,6 +222,15 @@ if(FASTLOG)
add_definitions(-DDEBUGFAST)
endif()
# For now GLES and EGL are tied to each other.
# Enabling GLES also disables the OpenGL plugin.
option(USE_GLES "Enables GLES, disables OGL" OFF)
if(USE_GLES)
message("GLES rendering enabled")
add_definitions(-DUSE_GLES)
add_definitions(-DUSE_EGL)
set(USE_EGL True)
endif()
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
########################################
@@ -572,7 +585,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h
)
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
########################################
# Optional Targets
# TODO: Add DSPSpy and TestSuite.
@@ -608,19 +620,20 @@ set(CPACK_PACKAGE_VENDOR "Dolphin Team")
set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH})
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Gamecube, Wii and Triforce emulator")
# TODO: CPACK_PACKAGE_DESCRIPTION_FILE
# TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY
set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other)
set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0)
# TODO: CPACK_RESOURCE_FILE_README
# TODO: CPACK_RESOURCE_FILE_WELCOME
# TODO: CPACK_PACKAGE_EXECUTABLES
# TODO: CPACK_PACKAGE_ICON
# TODO: CPACK_NSIS_*
# TODO: Use CPack components for DSPSpy, etc => cpack_add_component
set(CPACK_SET_DESTDIR ON)
set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP")
set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.svn")
set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.git")
list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}")
# CPack must be included after the CPACK_* variables are set in order for those
Data/Sys/Wii/setting-kor.txt
BIN
View File
Binary file not shown.
Data/User/GameConfig/G3QEA4.ini
+18 -7
View File
@@ -1,7 +1,18 @@
# G3QEA4 - TMNT3
[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 = 5
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
# G3QEA4 - TMNT3
[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 = 5
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_Settings]
Data/User/GameConfig/G3RD52.ini
+16
View File
@@ -0,0 +1,16 @@
# G3RD52 - Shrek 2
[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 = Sound issues need lle audio to be fixed.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 1
PH_SZNear = 1
PH_SZFar = 1
PH_ExtraParam = 0
PH_ZNear = 20
PH_ZFar = 1.99998
[Gecko]
Data/User/GameConfig/G3RE52.ini
+16
View File
@@ -0,0 +1,16 @@
# G3RE52 - Shrek 2
[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 = Sound issues need lle audio to be fixed.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 1
PH_SZNear = 1
PH_SZFar = 1
PH_ExtraParam = 0
PH_ZNear = 20
PH_ZFar = 1.99998
[Gecko]
Data/User/GameConfig/G3RF52.ini
+16
View File
@@ -0,0 +1,16 @@
# G3RF52 - Shrek 2
[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 = Sound issues need lle audio to be fixed.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 1
PH_SZNear = 1
PH_SZFar = 1
PH_ExtraParam = 0
PH_ZNear = 20
PH_ZFar = 1.99998
[Gecko]
Data/User/GameConfig/G3RP52.ini
+16
View File
@@ -0,0 +1,16 @@
# G3RP52 - Shrek 2
[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 = Sound issues need lle audio to be fixed.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]
ProjectionHack = 1
PH_SZNear = 1
PH_SZFar = 1
PH_ExtraParam = 0
PH_ZNear = 20
PH_ZFar = 1.99998
[Gecko]
Data/User/GameConfig/G6NE69.ini
+10 -1
View File
@@ -2,6 +2,15 @@
[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 =
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
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]
Data/User/GameConfig/G6NP69.ini
+10 -1
View File
@@ -2,6 +2,15 @@
[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 =
EmulationIssues = Sound issues need LLE audio to be fixed and the videos are messed up.
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]
Data/User/GameConfig/G9TD52.ini
+18
View File
@@ -0,0 +1,18 @@
# G9TD52 - Shark Tale
[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 = Needs LLE audio for proper sound.
[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 = 0
Data/User/GameConfig/G9TE52.ini
+18
View File
@@ -0,0 +1,18 @@
# G9TE52 - Shark Tale
[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 = Needs LLE audio for proper sound.
[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 = 0
Data/User/GameConfig/G9TF52.ini
+18
View File
@@ -0,0 +1,18 @@
# G9TF52 - Shark Tale
[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 = Needs LLE audio for proper sound.
[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 = 0
Data/User/GameConfig/G9TI52.ini
+18
View File
@@ -0,0 +1,18 @@
# G9TI52 - Shark Tale
[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 = Needs LLE audio for proper sound.
[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 = 0
Data/User/GameConfig/G9TP52.ini
+18
View File
@@ -0,0 +1,18 @@
# G9TP52 - Shark Tale
[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 = Needs LLE audio for proper sound.
[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 = 0
Data/User/GameConfig/GBHDC8.ini
+18
View File
@@ -0,0 +1,18 @@
# GBHDC8 - Mystic Heroes
[EmuState]
#The Emulation State (as of Dolphin r1027)
EmulationStateId = 4
EmulationIssues = Needs Real xfb for the videos to display.
[OnFrame]
[ActionReplay]
[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/GBHEC8.ini
+46 -74
View File
@@ -1,147 +1,119 @@
# GBHEC8 - Mystic Heroes
[EmuState]
#The Emulation State (as of Dolphin r1027)
EmulationStateId = 4
EmulationIssues = Needs Real xfb for the videos to display.
[OnFrame]
#Add memory patches here.
#Add decrypted action replay cheats here.
[ActionReplay]
$(m)
$(m)
01180C36 88000000
C4201E68 0000FF00
$Max Health
$Max Health
01180C37 08000000
02264788 0000270F
$Max Magic
$Max Magic
01180C38 08000000
0226478A 0000270F
$Max Attack
$Max Attack
01180C39 08000000
0226478C 0000270F
$Max Defense
$Max Defense
01180C3A 08000000
0226478E 0000270F
$Max Rune Attack
$Max Rune Attack
01180C3B 08000000
02264790 0000270F
$Max Rune Defense
$Max Rune Defense
01180C3C 08000000
02264792 0000270F
$Have All Runes
$Have All Runes
01180C3D 08000000
022647C0 0005FFFF
$Max Level All Magic Slots
$Max Level All Magic Slots
01180C3E 08000000
042647A8 09090909
$Start On Level 1-2
$Start On Level 1-2
01180C3F 08000000
0226475A 00000102
$Start On Level 1-3
$Start On Level 1-3
01180C40 08000000
0226475A 00000103
$Start On Level 2-1
$Start On Level 2-1
01180C41 08000000
0226475A 00000201
$Start On Level 2-2
$Start On Level 2-2
01180C42 08000000
0226475A 00000202
$Start On Level 2-3
$Start On Level 2-3
01180C43 08000000
0226475A 00000203
$Start On Level 3-1
$Start On Level 3-1
01180C44 08000000
0226475A 00000301
$Start On Level 3-2
$Start On Level 3-2
01180C45 08000000
0226475A 00000302
$Start On Level 3-3
$Start On Level 3-3
01180C46 08000000
0226475A 00000303
$Start On Level 4-1
$Start On Level 4-1
01180C47 08000000
0226475A 00000401
$Start On Level 4-2
$Start On Level 4-2
01180C48 08000000
0226475A 00000402
$Start On Level 4-3
$Start On Level 4-3
01180C49 08000000
0226475A 00000403
$Start On Level 5-1
$Start On Level 5-1
01180C4A 08000000
0226475A 00000501
$Start On Level 5-2
$Start On Level 5-2
01180C4B 08000000
0226475A 00000502
$Start On Level 5-3
$Start On Level 5-3
01180C4C 08000000
0226475A 00000503
$Start On Level 6-1
$Start On Level 6-1
01180C4D 08000000
0226475A 00000601
$Start On Level 6-2
$Start On Level 6-2
01180C4E 08000000
0226475A 00000602
$Start On Level 6-3
$Start On Level 6-3
01180C4F 08000000
0226475A 00000603
$Start On Level 7-1
$Start On Level 7-1
01180C50 08000000
0226475A 00000701
$Start On Level 7-2
$Start On Level 7-2
01180C51 08000000
0226475A 00000702
$Start On Level 7-3
$Start On Level 7-3
01180C52 08000000
0226475A 00000703
$Start On Level 7-4
$Start On Level 7-4
01180C53 08000000
0226475A 00000704
$Start On Level 8-1
$Start On Level 8-1
01180C54 08000000
0226475A 00000801
$Start On Level 8-2
$Start On Level 8-2
01180C55 08000000
0226475A 00000802
$Start On Level 8-3
$Start On Level 8-3
01180C56 08000000
0226475A 00000803
$Start On Level 8-4
$Start On Level 8-4
01180C57 08000000
0226475A 00000804
[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/GBHFC8.ini
+18
View File
@@ -0,0 +1,18 @@
# GBHFC8 - Mystic Heroes
[EmuState]
#The Emulation State (as of Dolphin r1027)
EmulationStateId = 4
EmulationIssues = Needs Real xfb for the videos to display.
[OnFrame]
[ActionReplay]
[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/GBHPC8.ini
+18
View File
@@ -0,0 +1,18 @@
# GBHPC8 - Mystic Heroes
[EmuState]
#The Emulation State (as of Dolphin r1027)
EmulationStateId = 4
EmulationIssues = Needs Real xfb for the videos to display.
[OnFrame]
[ActionReplay]
[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/GBSE8P.ini
+11 -2
View File
@@ -1,7 +1,16 @@
# GBSE8P - BEACH SPIKERS
[Core] Values set here will override the main dolphin settings.
EnableFPRF = True
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Controlls don't work ingame only walking works
EmulationStateId = 4
EmulationIssues = Needs lle audio to solve sound 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]

Some files were not shown because too many files have changed in this diff Show More