Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
This commit is contained in:
Matthew Parlane 2013-02-23 17:02:58 +13:00
commit c30b8c9eae
136 changed files with 1076 additions and 1371 deletions

View File

@ -3,7 +3,8 @@
#
cmake_minimum_required(VERSION 2.6)
option(USE_GLES "Enables GLES, disables OGL" OFF)
option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
option(USE_EGL "Enables EGL OpenGL Interface" OFF)
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
option(FASTLOG "Enable all logs" OFF)
@ -259,10 +260,15 @@ endif(GDBSTUB)
# Enabling GLES also disables the OpenGL plugin.
if(USE_GLES)
message("GLES rendering enabled")
add_definitions(-DUSE_GLES)
add_definitions(-DUSE_EGL)
add_definitions(-DUSE_GLES=1)
add_definitions(-DUSE_EGL=1)
set(USE_EGL True)
endif()
if(USE_EGL)
message("EGL OpenGL interface enabled")
add_definitions(-DUSE_EGL=1)
endif()
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
########################################

View File

@ -3,7 +3,7 @@
TLBHack = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 4
EmulationIssues =
EmulationIssues = The videos are messed up, skip them.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
$Master Code
@ -40,3 +40,9 @@ $Away Team Never Scores
00416F8C 00000000
[Video]
ProjectionHack = 0
PH_SZNear = 0
PH_SZFar = 0
PH_ExtraParam = 0
PH_ZNear =
PH_ZFar =
[Gecko]

View File

@ -0,0 +1,16 @@
# GF8P69 - FIFA Street
[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 = The 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]

View File

@ -1,9 +1,11 @@
# GOSE41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]

View File

@ -1,9 +1,11 @@
# GOSP41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]

View File

@ -1,9 +1,11 @@
# GOSX41 - Open Season
[Core] Values set here will override the main dolphin settings.
TLBHack = 1
MMU = 1
FastDiscSpeed = 1
BlockMerging = 1
[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
EmulationStateId = 2
EmulationIssues = Severe graphic issues.
EmulationStateId = 4
EmulationIssues = Needs MMU (Slow).
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Video]

View File

@ -33,7 +33,7 @@ PH_ExtraParam = 1
[5]
Title = Tales of Symphonia GC
PH_ZNear = 0.0002
PH_ZNear = 0.00026
# ---------------------------------------------------

View File

@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ SafeTextureCacheColorSamples = 512
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -16,4 +16,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -16,4 +16,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -16,4 +16,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -10,4 +10,3 @@ EmulationStateId = 5
[Video]
ProjectionHack = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -15,4 +15,3 @@ PH_ZFar =
[Gecko]
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -15,4 +15,3 @@ PH_ZFar =
[Gecko]
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -15,4 +15,3 @@ PH_ZFar =
[Gecko]
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -24,6 +24,5 @@ PH_ZFar =
[Video_Enhancements]
ForceFiltering = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
DlistCachingEnable = False

View File

@ -18,6 +18,5 @@ PH_ZFar =
[Video_Enhancements]
ForceFiltering = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
DlistCachingEnable = False

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -36,4 +36,3 @@ C2152674 00000002
3CA03B9B 38A5C9FF
90B60178 00000000
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -9,4 +9,3 @@ EmulationIssues = Use dx11 plugin (r6945)
ProjectionHack = 0
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -9,4 +9,3 @@ EmulationIssues = Use dx11 plugin (r6945)
ProjectionHack = 0
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -6,7 +6,6 @@ EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues =
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
EFBEmulateFormatChanges = True

View File

@ -21,6 +21,5 @@ SafeTextureCacheColorSamples = 512
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
EFBEmulateFormatChanges = True

View File

@ -23,6 +23,5 @@ SafeTextureCacheColorSamples = 512
EFBToTextureEnable = False
EFBCopyEnable = True
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
EFBEmulateFormatChanges = True

View File

@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues = Needs single core to run properly(r7436).
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[Video_Hacks]
EFBEmulateFormatChanges = True
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
UseXFB = True
UseRealXFB = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -32,5 +32,4 @@ $Rapid Fire [TNTkryzt]
SafeTextureCacheColorSamples = 512
[Video_Enhancements]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ EmulationIssues =
DlistCachingEnable = False
[Video_Settings]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -67,4 +67,3 @@ $Profile Three Name Changer Jedi Hack & [Mitch]
DlistCachingEnable = False
[Video_Settings]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ EmulationIssues =
[ActionReplay]
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
EFBScale = 1
SafeTextureCacheColorSamples = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
EFBScale = 1
SafeTextureCacheColorSamples = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
EFBScale = 1
SafeTextureCacheColorSamples = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,4 +17,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues = Needs real xfb for videos to show up.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -16,4 +16,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 512
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues = Suffers from random ingame lock ups.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
[Video_Enhancements]
MaxAnisotropy = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
[Video_Enhancements]
MaxAnisotropy = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -18,4 +18,3 @@ EFBEmulateFormatChanges = True
[Video_Enhancements]
MaxAnisotropy = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -6,7 +6,6 @@ EmulationIssues = Direct 3d 11 fixes some texture glitches.
[OnFrame] Add memory patches to be applied every frame here.
[ActionReplay] Add action replay cheats here.
[Wii]
DisableWiimoteSpeaker = 1
[Video]
ProjectionHack = 0
PH_SZNear = 0

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -14,4 +14,3 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -17,5 +17,4 @@ PH_ZFar =
EFBAccessEnable = True
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Settings]

View File

@ -17,5 +17,4 @@ PH_ZFar =
EFBAccessEnable = True
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Settings]

View File

@ -17,5 +17,4 @@ PH_ZFar =
EFBAccessEnable = True
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Settings]

View File

@ -17,5 +17,4 @@ PH_ZFar =
EFBAccessEnable = True
DlistCachingEnable = False
[Wii]
DisableWiimoteSpeaker = 1
[Video_Settings]

View File

@ -14,6 +14,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
DlistCachingEnable = False

View File

@ -14,6 +14,5 @@ PH_ZNear =
PH_ZFar =
[Gecko]
[Wii]
DisableWiimoteSpeaker = 1
[Video_Hacks]
DlistCachingEnable = False

View File

@ -16,4 +16,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 0
[Wii]
DisableWiimoteSpeaker = 1

View File

@ -16,4 +16,3 @@ PH_ZFar =
[Video_Settings]
SafeTextureCacheColorSamples = 0
[Wii]
DisableWiimoteSpeaker = 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -200,6 +200,7 @@ void OpenALStream::SoundLoop()
u64 num_samples_to_render = (audio_dma_period * ais_samples_per_second) / SystemTimers::GetTicksPerSecond();
unsigned int numSamples = (unsigned int)num_samples_to_render;
unsigned int minSamples = surround_capable ? 240 : 0; // DPL2 accepts 240 samples minimum (FWRDURATION)
numSamples = (numSamples > OAL_MAX_SAMPLES) ? OAL_MAX_SAMPLES : numSamples;
numSamples = m_mixer->Mix(realtimeBuffer, numSamples);
@ -236,9 +237,15 @@ void OpenALStream::SoundLoop()
// Adjust SETTING_SEQUENCE_MS to balance between lag vs hollow audio
soundTouch.setSetting(SETTING_SEQUENCE_MS, (int)(1 / (rate * rate)));
soundTouch.setTempo(rate);
if (rate > 10)
{
soundTouch.clear();
}
}
unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS);
if (nSamples > 0)
unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * OAL_MAX_BUFFERS);
if (nSamples > minSamples)
{
// Remove the Buffer from the Queue. (uiBuffer contains the Buffer ID for the unqueued Buffer)
if (iBuffersFilled == 0)

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