73da6f4f3f
Merge branch 'master' into FIFO-BP
...
# By Jordan Woyak (46) and others
# Via Jordan Woyak (2) and others
* master: (70 commits)
Fixes two memory leaks, one is pretty bad for OSX. Yell at pauldachz if this doesn't work. Or... say thanks.
Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
Make ARMJit core default CPU core on ARM architecture
Fix a StringUtil regression from the arm-noglsl merge
Small improvement to cmpli/cmpi in ARMJit.
Merge latest ArmEmitter changes from ppsspp while we're at it.
Ah. I blame vim on this typo entirely.
Add disabled code for authenticating wiimotes on Windows.
Add the missing FPR cache
Buildfix.
Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
Abort loading states from incompatible graphics backends.
ARM Support without GLSL
Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
Begin implementing save states to video software. Kind of works, sometimes.
Make error message for loading save state with wrong dsp engine shorter.
Abort load state if it uses a different dsp engine, instead of crashing.
Update the gameini of F-zero. Efb to Ram is no longer the default choice.
fix last commit by neobrain
...
Conflicts:
Source/Core/VideoCommon/Src/Fifo.cpp
2013-03-01 20:12:56 +11:00
a2d08d6740
Fix Dolphin starting only once then crashing at startup
2013-03-01 10:11:08 +01:00
99cf57eb39
Fixes two memory leaks, one is pretty bad for OSX.
...
Yell at pauldachz if this doesn't work.
Or... say thanks.
2013-03-01 19:21:34 +13:00
b0630790c1
It's 2013! Why can't I use C++11 yet!?
2013-02-28 19:42:29 -06:00
dea1e2827d
Open std::fstream in a unicode-safe manner.
2013-02-28 19:33:39 -06:00
7a04ec6f92
Implemented proper timing for the sample counter in the AudioInterface, removing the previous hack.
...
Cleaned up some of the audio streaming code.
2013-03-01 11:51:11 +11:00
b94f65b666
Remove two incorrect lines. How did those even get there?!
2013-03-01 01:37:47 +01:00
cbf5efe191
Some cleanups.
...
PE perf metrics officially declared unsupported for the D3D9 project (out of pure laziness, anyone who cares can implement them :P).
2013-03-01 01:31:57 +01:00
1c9860246c
Build fixes for everyone!
2013-03-01 01:14:10 +01:00
d0dbcc6369
VideoSoftware: Cleanup PE perf metrics; returning the proper value now.
2013-03-01 01:08:43 +01:00
7682ed22c6
Merge branch 'master' into perfqueries.
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
2013-03-01 01:07:34 +01:00
5c4a130688
Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
2013-03-01 10:28:42 +11:00
bc15919e2e
Make ARMJit core default CPU core on ARM architecture
2013-02-28 16:15:32 -06:00
0c16489c39
Merge branch 'VideoSoftware-savestates'
2013-02-28 13:36:29 -05:00
0399959c39
Skipped the EE check if there is a CP interrupt pending.
...
Fixes issue 4336.
2013-03-01 00:59:38 +11:00
07539b9a3f
Fix a StringUtil regression from the arm-noglsl merge
...
Fixes issue 6048. Thanks to Starscream for locating the regression.
2013-02-28 13:12:35 +01:00
95558cdc69
Buildfix.
2013-02-28 03:11:10 -06:00
03ec9a2e08
Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.
2013-02-28 02:40:03 -06:00
56f09d3b91
Attempt to be consistent with conversions between std::string and wxString.
2013-02-28 02:30:05 -06:00
e82d976d2f
Buildfix for non-legacy OSes.
2013-02-27 20:55:19 -06:00
6f87611767
Fix "Core" to build with "Unicode".
2013-02-27 20:30:57 -06:00
536c110b31
Fix "DiscIO" to build with "Unicode".
2013-02-27 20:04:07 -06:00
65683ebc64
Hopefully fix all filename handling to support Unicode.
2013-02-27 20:03:06 -06:00
69f7671ee8
Fix "Common" to build with "Unicode" project setting.
2013-02-27 19:19:38 -06:00
ea75577278
Use the new UTF-16 conversion function in two places.
2013-02-27 18:02:07 -06:00
0ea458b4dc
Add functions for converting between UTF-8/16.
2013-02-27 18:00:42 -06:00
9ff704f202
Small improvement to cmpli/cmpi in ARMJit.
2013-02-27 15:17:23 -06:00
f1d727cf13
Merge latest ArmEmitter changes from ppsspp while we're at it.
2013-02-27 11:53:24 -06:00
8c779bb242
Ah. I blame vim on this typo entirely.
2013-02-27 10:26:32 -06:00
ae46a2f102
also remove cg from windows install scripts
2013-02-27 11:06:04 +01:00
1b8d044543
clear cg from project files
2013-02-27 10:55:25 +01:00
6b80e6f83c
Tweak Vertex/Index buffer handling a bit.
2013-02-27 01:57:02 -06:00
e435851e7a
Add disabled code for authenticating wiimotes on Windows.
2013-02-26 21:13:35 -06:00
692e39d1bb
Merge branch 'arm-noglsl'
2013-02-27 02:22:08 +00:00
be7643cd2d
Add the missing FPR cache
2013-02-27 02:15:32 +00:00
a680d17eef
Buildfix.
2013-02-26 19:59:33 -06:00
f1c990069c
Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
2013-02-26 20:47:48 -05:00
46f5c19c6d
Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
2013-02-26 18:52:38 -05:00
08fe3c213a
Abort loading states from incompatible graphics backends.
2013-02-26 18:28:56 -05:00
ae481068cd
cleanup ogl extension osd
2013-02-26 23:36:22 +01:00
a650ae8c7b
workaround for base vertex. damn old nvidia driver
2013-02-26 23:15:55 +01:00
025f8d342f
remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing
2013-02-26 21:48:35 +01:00
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
9bc8d6e02b
make samplercache global and call constructor/destructor
2013-02-26 18:30:13 +01:00
4883fa268f
Split VideoBackend::Cleanup from Shutdown.
...
First is called from ogl/d3d thread, second is called from emulation thread (x11...)
2013-02-26 16:42:32 +01:00
90ff648d00
shader cache based by git revision
2013-02-26 10:48:19 +01:00
b83a1e3b66
Disabled "Speed up disc transfer" from the ZTP GC game ini.
2013-02-26 19:39:11 +11:00
8b7141d3de
Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer."
...
This reverts commit 380f22ca0e
2013-02-26 08:57:35 +01:00
e69c58ee89
Removed the disc seek times for GC games and removed the disc speed option on Wii games.
...
Checked for external exceptions only in mtmsr.
Fixes issue 5545.
2013-02-26 18:10:02 +11:00
db838e759b
Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
2013-02-26 01:36:24 -05:00
skidau