367f294ed2
[Android] Make sure to unallocate the correct memory size in MemArena.
2013-08-16 04:55:43 -05:00
59e060aba2
Missed some VS build options.
2013-08-16 21:42:31 +12:00
9de7611ff9
Merge branch 'master' into wii-network
...
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
c3065ecb66
Fix compatibility with the SDL2.0 release.
...
SDL2.0 removed SDL_HAPTIC_SQUARE because of ABI issues (see comment #7 on issue
6491 by Ryan C. Gordon from the SDL project). It will be reintroduced again in
2.1, so keep the code and #ifdef it away.
2013-08-15 22:18:40 +02:00
ba6a67a5f1
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-15 13:49:53 -03:00
417552b21e
Not sure what that was.
2013-08-16 01:06:44 +12:00
c6d8d52041
Fix a warning introduced by the recent netplay UI changes
2013-08-15 15:05:20 +02:00
d6ec6ae97a
Fix polarssl on Windows.
2013-08-16 00:24:10 +12:00
d8b39b9dcf
Support PolarSSL on *nix
...
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
2013-08-15 23:36:17 +12:00
b93d62dcb8
Remove LTCG and platform toolset, fix code style.
2013-08-15 21:43:43 +12:00
fede38985e
Replace OpenSSL with PolarSSL
...
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
979718484f
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-15 00:21:28 -03:00
3380e47ca7
MemArena: Free memory for 64-bit machines
...
Make the logic here a lot simpler. Patch contributed by Google Code
user plbl4ster.
2013-08-14 20:34:15 -04:00
1826fce946
NetPlay: Make sure the server knows it's stopped when it's stopped
...
This is embarassing.
2013-08-14 18:36:09 -04:00
7622d5b354
Only call SetGenerationMode from BPWritten if the cull mode changed.
...
Should decrease CPU usage on the GPU thread by a bit in the OGL backend.
2013-08-15 00:26:03 +02:00
998194246c
NetPlay: Disable the "Start" button while the game is running
2013-08-14 18:16:07 -04:00
1c74e412e2
NetPlay: Remove the "Stop" button
...
Now that the host can simply close the window, there's no need for this extra control.
2013-08-14 18:16:06 -04:00
5241deaebe
NetPlay: Allow hosts to stop the game by closing the game window
2013-08-14 18:16:05 -04:00
92f8d79574
NetPlay: Set the pad buffer size on server creation
...
If we don't do this, then when the game starts we'll send out the
buffer size to clients being a super large value of junk, and they'll
hang forever trying to accumulate an input buffer a size that they'll
never ever reach in a million years.
This never manifested in release builds for some reason.
2013-08-14 18:15:28 -04:00
26f58e1ba5
Add an option to enable performance queries in gameini files, disable it by default
2013-08-14 23:16:46 +02:00
ffdd79df36
Move VideoBackendBase from Common to VideoCommon
2013-08-14 23:16:46 +02:00
0cd94b5bc7
VertexShaderGen: Cleanup.
2013-08-14 11:47:23 +00:00
85f91d66ba
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-13 17:30:22 -03:00
a791733c27
Fix invalid C++ code (returning reference to local) - thanks devm33.
2013-08-13 14:47:32 -04:00
9e0fc8b42d
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-12 21:32:25 -03:00
c05aa0141d
ShaderGen: Optimize out most function calls for uid generation.
2013-08-12 18:30:42 +02:00
fe2ca814c5
LightingShaderGen: Use macro magic instead of snprintf. Should fix performance problems.
2013-08-12 18:30:42 +02:00
22d9736787
ShaderGen: Static inline everything.
2013-08-12 18:30:42 +02:00
69a5a79c03
PixelShaderGen: Optimize shader uid data order.
2013-08-12 18:30:42 +02:00
7a1940020d
VertexShaderGen: Optimize shader uid data order.
2013-08-12 18:30:41 +02:00
5948665cd6
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-12 10:30:19 -03:00
d0084cb41d
Main: Fix code that creates the BIOS subdirectories
...
We need to ensure that the file path ends with DIR_SEP, as
File::CreateFullPath is a very naive function.
2013-08-12 06:23:58 -04:00
4c22e1264e
PixelShaderGen: Do not write depth in pixel shader if depth testing (and thus writing) is not enabled. Should improve performance quite a bit in some cases.
...
Fixes issue 6474.
2013-08-12 09:33:36 +00:00
7f3c06de27
[ARM] Add a few instructions.
2013-08-12 02:52:56 +00:00
f4000b6b42
Add the ability to force Dual Source Blending in the configuration file.
...
this way everyone can check if their hardware support this feature in dx9
2013-08-11 18:48:31 -03:00
22b3c26654
Main: Create BIOS subdirs of GC userdir on load
...
So that users don't get confused about where to place the BIOS files
2013-08-11 14:33:26 -04:00
d0729983b0
Check for GC BIOS in userdir before sysdir
2013-08-11 14:13:45 -04:00
b5c2737c9f
IniFile: Don't parse comments after the [Section] brackets
...
This is non-standard behavior. We won't fail to parse, but we now
won't write them back out either.
2013-08-11 11:32:10 -04:00
0eaea5f4df
IniFile: Remove support for comments anywhere but the beginning of lines
...
The MS INI parser and most other INI parsing libraries APIs only support
comments at the beginning of lines. Right now, some Game INI files use sections
like:
[OnFrame]#Add memory patches here
But these section headers are parsed separately, so this should not break
them.
2013-08-11 11:30:52 -04:00
4ed8972c30
[ARM] Implement andx, andi_rc, and andis_rc.
2013-08-11 08:21:17 +00:00
42aef24d78
[ARM] IMM support for all integer instructions that call ComputeRC. Small FPS gains everywhere.
2013-08-11 07:41:23 +00:00
ef83d03dc0
[ARM] Fix ori again.
2013-08-11 05:07:20 +00:00
a279001472
Remove "-0" from stable version numbers in a more foolproof manner for vs and cmake builds.
2013-08-10 17:19:19 -05:00
951d8e356a
Remove some non-catastrophic IPC_HLE wiimote related PanicAlerts. We have logging for this.
...
Fixed issue 6464.
2013-08-10 16:50:12 -05:00
eed36cbf78
D3D11: Implement zcomploc for hardware supporting D3D 11.0.
2013-08-09 22:20:35 +02:00
805009abca
Fix a merge fail that happened when I merged in Android. It is just a bit of duplicate code, no issues came from it.
2013-08-09 19:01:27 +00:00
0aa9308006
Revert "Fix a memory leak in ExpressionParser.cpp"
...
This reverts commit cce809ac90
.
The code was actually correct: "expr" is never allocated when an error is
returned. This means when the expression parser fails, deleting "expr" means
deleting an uninitialized pointer.
2013-08-09 10:46:11 +02:00
90d454d22f
Remove -0 from stable release version numbers.
2013-08-08 23:59:53 -04:00
9ea01aa7a8
Use a multibyte-neutral codepage when calling *printf on Windows.
...
More explanation in code comments.
Fixes issue 4046.
2013-08-09 00:17:48 +02:00
cce809ac90
Fix a memory leak in ExpressionParser.cpp
...
Because there's a return here, expr should be deleted since it's not assigned to anything before returning.
2013-08-08 17:56:15 -04:00