archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 20:01:40 +02:00
Code Issues Projects Releases Packages Wiki Activity
12258 commits 5 branches 11 tags 1.3 GiB
Commit graph

1513 commits

Author SHA1 Message Date
Ryan Houdek
7d410ec95c [ARM] VRSQRTE NEON emitter. 2013-09-16 12:58:20 +00:00
Ryan Houdek
beb41a8f56 [ARM] Add NEON VORR and fix encoding on NEON VEOR. Remove VMRS_APSR because it is the same as VMRS(PC) 2013-09-16 07:49:16 +00:00
Pierre Bourdon
f0fc611f15 Add a hacky check for text file size in ReadFileToString. Fixes issue 6455. 2013-09-16 06:57:44 +02:00
Pierre Bourdon
037199c326 Look for portable.txt in the exe directory and activate portable mode if it exists 2013-09-16 05:46:07 +02:00
Pierre Bourdon
2c350a5e6b Fix INIFile ignoring the last line of files 2013-09-16 05:28:14 +02:00
Pierre Bourdon
24e9aedc14 Merge branch 'global-user-directory' 
Please read https://wiki.dolphin-emu.org/index.php?title=Controlling_the_Global_User_Directory
for documentation about this feature.

Thanks to neobrain and RachelB for their work on this change, and thanks to
everyone who helped test it.
 2013-09-14 19:24:27 +02:00
Pierre Bourdon
501eafb407 Overlay local gameinis over global gameinis instead of copying. 
Huge megacommit because a lot of things needed to be modified to make this
possible.
 2013-09-14 17:46:41 +02:00
Ryan Houdek
81d7986202 [ARM] Add LSRS emitters, and ASR{S} register emitters. Fixes encoding in LSR emitter. 2013-09-14 09:06:49 +00:00
Pierre Bourdon
cf4c39d2be IniFile: Support extending the list of loaded keys and sections with data from other ini files. 
Changes a lot of parsing code which previously was not aware of the notion of
key/value, and operated only with raw lines. Now key/value is the default and
lines are handled as raw only if they do not contain =, or they start with $ or
+ (for Gecko/AR compatibility).
 2013-09-14 06:08:31 +02:00
Pierre Bourdon
aa202c2e21 Move global gameinis from User to Sys. Get rid of SHARED_USER. 2013-09-14 06:08:30 +02:00
Pierre Bourdon
86e765f3eb Move Themes/ from User to Sys. Only Gameinis remain. 2013-09-14 06:08:30 +02:00
Pierre Bourdon
b587af3ea3 Change the initial user directory creation to stop special casing Windows 2013-09-14 06:08:29 +02:00
Rachel Bryk
dfcef6890e Use global user directory on windows. 
Can override by setting HKCU\Software\Dolphin-emu\LocalUserConfig to true.
 2013-09-14 06:08:29 +02:00
Jordan Woyak
ef1d33647f Improve the ArraySize function a bit now that c++11 isn't forbidden there. Error messages should be friendlier now. 2013-09-12 12:57:13 -05:00
comex
b9c1af04ad Replace the one use of CompileTimeAssert with static_assert (already used elsewhere). 2013-09-11 20:58:47 -04:00
Jordan Woyak
fde3815d34 Replace ARRAYSIZE macro with another ugly macro. At least this will throw an error for a non-array and won't conflict with Windows macro names. 2013-09-11 19:19:36 -05:00
Ryan Houdek
c1aa80cefa [ARM] Add support for double registers in VMOV(immediate). Add VEOR and VSTR1. Fix some minor encoding bugs. 2013-09-08 21:56:17 +00:00
Ryan Houdek
e6af4970d8 [ARM] Use NEON for loading the values from psq_l, gives a minimal performance increase. This change also begins a new NEONXEmitter for having cleaner support for NEON. 2013-09-08 07:07:15 +00:00
Ryan Houdek
d0d053a9f9 Fix for old libc version on bionic. Old versions would crash if the second argument was NULL. 2013-09-04 02:04:31 -05:00
comex
4c3230bcde Remove accessType from BackPatch's signature in favor of getting it from DisassembleMov. 
It isn't easily accessible with sigaction or Mach exceptions (well,
requires an additional system call in the latter), and isn't necessary.

(and get rid of the enum, because it's only used once, and the comments
are more expressive than enum names)
 2013-09-02 16:55:22 -04:00
Ryan Houdek
e7157e7c52 [Android] Fix fastmem and enable. 2013-09-02 04:10:21 -05:00
comex
35b8dfbe0c A few more warnings. 2013-09-01 23:33:35 -04:00
comex
4f5729dd59 MSVC warnings. 2013-09-01 22:59:32 -04:00
comex
fd7cf5bb71 A bunch of trivial changes to fix clang warnings. 2013-09-01 22:58:33 -04:00
comex
a6f6695ecd Work around MSVC bug, and make it less likely to happen again. Ew. 
MSVC insisted on using a copy assignment where a move was intended and
ought to be used.  This would have been caught, because the class in
question inherits from NonCopyable, which declares a move assignment
operator, which is supposed to delete the implicitly declared copy
assignment operator, but of course MSVC didn't do that either, causing a
class that should have been safe to be unsafe.
 2013-09-01 00:04:50 -04:00
comex
04c41c1d38 Fix loading DLC using IOCTL_ES_OPENTITLECONTENT & /dev/es state save. 
(Intertwined enough that's it's easier to do in one patch.)

(1) /dev/es did not support state save, which could cause crashes and
    incorrect behavior after loading.

(2) NANDContentLoader tried to read all of a title's contents into
    memory when it was first opened.  Two issues:

- If any contents were missing, it bailed out.  However, with DLC,
  only some of the contents may be downloaded, as determined by the
  permission bits in the ticket.  Instead, return an appropriate error
  when a content is accessed that doesn't exist on the filesystem
  (don't bother checking the permission bits though).

- Everything was loaded into memory - even if it consisted of 3 GB of
  songs, which caused Dolphin to lag out for quite a while (and would
  fail on 32-bit).  Instead, open content on demand.
 2013-08-31 01:38:52 -04:00
comex
4d6d4a97e4 Make NonCopyable use rvalue references. 
This is required to be able to move objects that inherit from it.
(Note that this patch also #ifs out the class for the externals that
include it yet are compiled in pre-C++11 mode.  It shouldn't matter,
since those externals don't use it.)
 2013-08-31 01:38:49 -04:00
Ryan Houdek
710ac04084 [ARM] Fix the VMOV encoding to encode the destination VFP register correctly. 2013-08-30 05:13:43 -05:00
Ryan Houdek
2c1337eb5f [ARM] Support both hardfp and softfp with lfs and lfd. Fixes these two instructions on Android since it uses softfp calling conventions. This adds a emitter for moving from two ARM Registers to a double VFP reg. 2013-08-30 09:38:11 +00:00
Ryan Houdek
8bb16d8e98 [Android] Android NDK now supports full implementations of std::mutex, std::thread, and std::conditional_variable so there is no need to have our own implementations there now. 2013-08-29 22:29:33 -05:00
comex
2de2e774fe Use pthread_setname_np. 
This makes SetCurrentThreadName actually work (name shows up in
debugger) on non-Windows.
 2013-08-29 16:30:32 -04:00
Ryan Houdek
160d72a9ae [Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile. 2013-08-29 04:43:31 -05:00
Matthew Parlane
b34a5faee7 More cleaning. 2013-08-28 01:07:43 +12:00
Matthew Parlane
75c398118f Fix headings and more. 2013-08-28 00:57:08 +12:00
Matthew Parlane
15f8603d1f Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.cpp
 2013-08-26 00:50:57 +00:00
Rachel Bryk
18749bad68 Actually allow the dump and logs folders to be set outside of user/ 2013-08-25 01:35:32 -04:00
Rachel Bryk
8882f89bbc Allow user folder to be set via command line. 
Clean up GetUserPath(), to allow setting any path with it.
 2013-08-24 23:15:55 -04:00
Pierre Bourdon
73be79f4e0 Fix trailing whitespaces in all files where some were added 2013-08-25 02:49:58 +02:00
Matthew Parlane
b6e054a2be Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
 2013-08-23 00:51:12 +12:00
Pierre Bourdon
20e82ec08c Fix the fix to AVX support detection 
Should be xgetbv(0) & 6 == 6, not just & 6. Thanks to tueidj for pointing this
out.
 2013-08-22 01:08:14 +02:00
Ryan Houdek
60ccb2f44d [Android] Fix Android 4.3 from crashing on my devices. This was annoying to find. 2013-08-21 00:12:53 -05:00
Pierre Bourdon
377202b9f6 Correctly check for AVX support in x64CPUDetect 
It's not enough to check for the CPUID bit to know if AVX is supported since
AVX requires OS support (new set of registers == more registers to be saved
when context switching). If the OS does not support, the cpuid bit will still
be set but using YMM registers will cause an illegal exception fault.
 2013-08-20 01:25:10 +02:00
Ryan Houdek
9bded1382c [ARM] Add ASR/ASRS and UMULLS emitters. 2013-08-19 06:26:34 +00:00
Ryan Houdek
367f294ed2 [Android] Make sure to unallocate the correct memory size in MemArena. 2013-08-16 04:55:43 -05:00
Matthew Parlane
59e060aba2 Missed some VS build options. 2013-08-16 21:42:31 +12:00
Matthew Parlane
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
Matthew Parlane
d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Matthew Parlane
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
Matthew Parlane
fede38985e Replace OpenSSL with PolarSSL 
Works on windows, not yet cmake.
 2013-08-15 20:47:47 +12:00
Jasper St. Pierre
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
Pierre Bourdon
ffdd79df36 Move VideoBackendBase from Common to VideoCommon 2013-08-14 23:16:46 +02:00
Jasper St. Pierre
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
Jasper St. Pierre
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
Jordan Woyak
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
Rachel Bryk
90d454d22f Remove -0 from stable release version numbers. 2013-08-08 23:59:53 -04:00
Pierre Bourdon
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
NeoBrainX
72abe7c654 Fix a stack corruption in ExtendedTrace. 
Fixes issue 6454.
 2013-08-08 20:29:20 +02:00
Lioncash
9d0554e4a6 Free two memory leaks in ArmCPUDetect.cpp 
Char pointers aren't freed after use.

Fixed this in PPSSPP a few days ago. Forgot to check here for the same thing until now.
 2013-08-06 18:17:54 -04:00
Ryan Houdek
ca7fb9f38e [ARM] Fix VCVT F32<->F64 encoding. 2013-08-03 00:48:44 +00:00
Ryan Houdek
ab0f42636d [ARM] Push new ArmEmitter changes from PPSSPP. Mostly Fixes a few VFP/NEON instruction encodings. 2013-08-02 23:18:44 +00:00
Jasper St. Pierre
52482115e1 Move in-game keybinding handling to a central location 
Instead of handling it separately in every backend.
 2013-07-21 23:17:16 -04:00
Ryan Houdek
f4b414a9c1 Fix encoding issue with VADD(Integer) 2013-07-16 22:18:15 -05:00
Ryan Houdek
9123f58bd5 Check for IDIVA/IDIVT correctly. Cortex-A5 parts would have had this set since it supports VFPv4 but not IDIVA. Qualcomm Krait/Krait 300 still doesn't report in the kernel that it supports this. 2013-07-16 01:22:25 -05:00
Ryan Houdek
012c32c14c [Android] Undefine the swaps in Android completely, not just on ARM Android. 2013-07-11 08:58:10 -05:00
Ryan Houdek
7d6b36bf73 Fix most ARM warnings 2013-07-05 19:56:15 -05:00
John Peterson
0fd3acd152 Saving real Wiimote state 
because that's simpler than reconnecting
 2013-06-25 09:24:14 -04:00
Ryan Houdek
6bb7cc5fea [Android] Add an about screen that shows build revision. 2013-06-22 22:54:36 -05:00
NeoBrainX
15943de313 Revert "Added optimizations to ClassifyFloat/Double functions in Mathutil.cpp and to PPCCache.cpp" 
This reverts commit 7aae9ccbc0.

Reasons:
- no test results have been provided to prove the usefulness of the patch
- broken coding style
- the author hasn't replied to any criticism
 2013-06-22 12:25:03 +02:00
Armada
fc7099a905 Set the locale per-thread instead of globally when generating shaders. Add cross-compatible versions of newlocale, uselocale and freelocale. 
This commit fixes a rare race condition when generating shaders because setlocale is global.
 2013-06-16 12:33:13 +02:00
eli173
7aae9ccbc0 Added optimizations to ClassifyFloat/Double functions in Mathutil.cpp and to PPCCache.cpp 2013-06-01 19:17:52 -05:00
Ryan Houdek
09def3ed3f [Android] Add in a compiling option for GLES3 2013-05-05 23:37:01 -05:00
Matthew Parlane
934e150596 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/ConfigManager.cpp
	Source/Core/Core/Src/HLE/HLE_OS.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
 2013-04-24 00:48:00 +12:00
Pierre
9a8dd7963e Merge branch 'dspjit' 
Conflicts:
	Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
 2013-04-21 12:29:18 +02:00
lioncash
d244bca1f5 Fix a bunch of random typos in comments and logging. 
Also update the comment headers for two functions in GCMemcard.cpp.
 2013-04-19 09:21:45 -04:00
Ryan Houdek
491ffabb56 Android Clang doesn't support TLS, so do the same thing as OSX. 2013-04-18 22:52:53 -05:00
Ryan Houdek
f811d11863 Fix clang building the std headers. 2013-04-18 22:52:05 -05:00
Ryan Houdek
d68955c539 Clang uses __clear_cache instead of __builtin___clear_cache like GCC 2013-04-18 22:50:58 -05:00
Lioncash
bab9963b00 New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. 2013-04-17 23:09:55 -04:00
lioncash
ef85b9af45 Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project. 
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.

Now, the Core is literally the only project with tab/space mismatches (on a large scale).
 2013-04-15 16:28:55 -04:00
Ryan Houdek
bde7ea00ef Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp 2013-04-14 20:39:56 -05:00
Pierre
6b5b8ab5be Implement and use MOVZX(64, 32,...) 
Probably better to keep that same-register-MOV assert useful. Also,
explicit type extension documents whats happening.

Internally, this boils down to the original MOV, but without the assert.
 2013-04-14 13:34:29 +02:00
Pierre
701b5916ab Revert "In memory of calc84." 
This reverts commit 539bf405f2.
 2013-04-14 13:34:29 +02:00
Ryan Houdek
605bbf5ca8 Merge remote-tracking branch 'origin/master' into Android-trash 2013-04-13 00:58:37 -05:00
Ryan Houdek
6d9c0c8863 Merge in latest changes to ArmEmitter from the PPSSPP crew. Should fix the dumb random crashes I had from IOS icache clearing not initializing a value. 2013-04-12 11:59:19 -05:00
Matthew Parlane
5eeed7aa9f This should never have been committed. Sorry. 2013-04-12 00:14:38 +12:00
Matthew Parlane
0c9d8d34e1 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/CMakeLists.txt
 2013-04-11 19:55:36 +12:00
Jordan Woyak
385d8e2b15 ChunkFile has allowed me to accidentally "Do" a non-POD for the last time! 2013-04-09 19:02:22 -05:00
Jordan Woyak
71f4bf25a7 Make FifoQueue take advantage of rvalue references to avoid std::vector copies. 2013-04-04 19:34:50 -05:00
Ryan Houdek
d06379fc59 Fix 32bit Linux. GCC's lrotl/lrotr instrinsic functions are 32bit when building for 32bit, we require 64bit at all times, so keep using our own instead. 2013-04-03 12:43:17 -05:00
Ryan Houdek
b5676fe82b Fix GCC 4.8 compiling. GCC 4.8 now defines _rotl/_rotr/_lrotl/_lrotr. 2013-04-03 10:52:26 -05:00
Jordan Woyak
d951c4c374 real buildfix 2013-04-02 13:07:51 -05:00
Jordan Woyak
c65473d9d3 Probably a sloppy buildfix. 2013-04-01 23:30:05 -05:00
Jordan Woyak
69779a4321 Fix loading of "themes" with non-ascii character names. 
Fixed issue 6189.
Why did GetUserPath return a non-const ref to string..?
 2013-04-01 23:22:20 -05:00
Pierre Bourdon
49d809ac0e Merge branch 'osx-libcxx' 2013-04-01 18:17:49 +02:00
Lioncash
58159a1693 Some more logging typos and clarifications. Missed these in my last commit. 
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.

A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).

Elaborations can be seen in WGL.cpp

I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
 2013-04-01 00:10:54 -04:00
Lioncash
f432d6038e Fix some typos and correct some capitalizations in the log messages. 
Makes the logging look more orderly and less spammy when spitting out things.
 2013-03-31 19:13:30 -04:00
Pierre Bourdon
194ada2481 More MSVC 2010 build fixes 2013-03-29 07:55:56 -07:00
Pierre Bourdon
38db520617 MSVC 2010 does not have <mutex> or <thread> either, adding the Std* files back 2013-03-29 07:53:45 -07:00
Pierre Bourdon
a8513e4605 Re-add StdConditionVariable, MSVC 2010 does not support <condition_variable> 2013-03-29 07:42:41 -07:00
Pierre Bourdon
4895e38bd5 This change might work better if I git add the files 2013-03-29 07:31:15 -07:00
Pierre Bourdon
b73941c0ea Use libc++ for Mac OS X builds now that we require >= 10.7 anyway 2013-03-29 07:29:31 -07:00
Lioncash
b1dd14c319 Fix a slight leak in LogManager. 
m_debuggerLog wasn't ever deleted in the destructor.
 2013-03-27 23:39:48 -04:00
skidau
7784fa4c67 Merge branch 'master' into wii-network 
# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
  Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
  Array overrun fixed in VertexShaderCache for the DX11 plugin.
  Fixed DSPTool build.
  Windows build fix
  Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
  VideoSoftware: Improve fog range adjustment by using less magic and more comments.
  revert RasterFont for VideoSoftware
  ogl: fix virtual xfb
  Windows build fix from web interface...
  Adjusted the audio loop criteria, using >= on the Wii and == on GC.  This fixes the audio static that occurred in Wii games after hours of play.
  Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
  VideoSoftware: Implement fog range adjustment, fixing issue 6147.
  implement 4xSSAA for OGL
  move ogl-only settings into backend
  Fix description of disable fog, and move it to enhancements tab.
  Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
  Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
  Forced the external exception check to occur sooner by changing the downcount.
  Mark the Direct3D9 backend deprecated.
  Prefer D3D11 and OpenGL over D3D9 by default.
  ...

Conflicts:
	CMakeLists.txt
	Source/Core/Common/Common.vcxproj.filters
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/Core.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
 2013-03-27 13:19:23 +11:00
Ryan Houdek
7034c79ab9 Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still. 2013-03-24 21:06:34 -05:00
NeoBrainX
bb3ce1f8d3 Mark the Direct3D9 backend deprecated. 2013-03-23 23:53:19 +01:00
NeoBrainX
816020f4eb Prefer D3D11 and OpenGL over D3D9 by default. 2013-03-23 23:52:30 +01:00
Ryan Houdek
d11679a06e Android mega commit of trash. 2013-03-19 21:53:09 -05:00
lioncash
edd9d0e0ef Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. 
Not planning to touch Core since it's the most actively changed part of the project.
 2013-03-19 21:51:12 -04:00
Ryan Houdek
7d74293170 Fix a typo in ArmEmitter noticed by LionCash. 2013-03-18 08:45:33 -05:00
Ryan Houdek
9ae9910490 Finish up VFP cleanup. A few more instructions are left for VFP, and a bunch of NEON ones if it will ever be used. 2013-03-18 00:10:56 +00:00
Pierre Bourdon
612c2e8516 Fix converting the charset of an empty string. Thanks to MrData on the forums for reporting this issue. 2013-03-17 14:37:00 +01:00
Ryan Houdek
8c1091a21f Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
 2013-03-15 11:19:52 -05:00
Ryan Houdek
e6c6053fcc Beginning of VFP cleanup. Will finish when I have the hardware in front of me. 2013-03-14 10:45:26 -05:00
Ryan Houdek
b4830be9bc Actually set the bIDIVa value in the ARM CPUDetect. 2013-03-14 08:48:01 -05:00
Ryan Houdek
c93f7760ce Really clean up all the emitter loadstores on ARM. If a ARM device supports VFPv4, then it supports IDIVA, so handle that in CPUDetect. 2013-03-14 01:50:38 +00:00
Ryan Houdek
202e2fa5c8 Add a new WriteNewStoreOp emitter function for beginning of rewrite of the Arm Emitter LoadStores. Will finish when I have the hardware in front of me to test on. 2013-03-13 14:08:54 -05:00
degasus
382be2aabd Merge branch 'master' into GLSL-master 
Conflicts:
	.gitignore
 2013-03-12 11:28:56 +01:00
Ryan Houdek
8406d9972d Fix JIT from rebasing on PPSSPP ArmEmitter. 2013-03-12 02:35:29 +00:00
Ryan Houdek
b94b4a9e8f Rebase ArmEmitter on PPSSPP's base. The loadstores are making my heart cry at this point. 2013-03-11 13:57:55 -05:00
Ryan Houdek
be217bf096 Add a comment about Qualcomm in load stores. 2013-03-07 20:28:18 -05:00
degasus
12e84f918a Merge branch 'master' into GLSL-master 
this fix debug build
 2013-03-07 17:05:32 +01:00
Ryan Houdek
f3528277c4 Make sure to mask out the FPU rounding mode correctly. Good spot from LionCash. 2013-03-07 09:52:38 -06:00
degasus
eaa5a77d9e fix debug build 2013-03-06 20:47:48 +01:00
degasus
a1c5e90083 Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
 2013-03-06 15:59:29 +01:00
degasus
8d5299c20b Merge branch 'vertex-loader-cleanup' 2013-03-06 14:08:02 +01:00
Ryan Houdek
d6558e1c31 Make the (V)LDR/(V)STR instructions support negative offsets. This fixes a bug where Arm Jit couldn't load the top 33 FPRs. Also makes it so the core can access all GPRs, FPRs, and SPRs in ppcState. This increases VPS 15-20 on SSBM intro movie on ODROIDX 2013-03-06 01:51:59 +00:00
Jordan Woyak
2095641af0 OK, seriously, buildfix. I shouldn't even have commit access! 2013-03-05 16:17:45 -06:00
Jordan Woyak
b34991c4c3 Buildfix for real. 2013-03-05 16:08:26 -06:00
Jordan Woyak
fe3a54d7fd Buildfix! 2013-03-05 15:48:57 -06:00
Jordan Woyak
10d57a3402 Use standard binary multiple unit symbols for game size display. 
Use integer math for the calculation as we cannot rely on floats for something as important as game size display!
 2013-03-05 14:58:30 -06:00
Jordan Woyak
f3f89e1d00 Merge branch 'master' into vertex-loader-cleanup 
Conflicts:
	Source/Core/Common/Src/CommonFuncs.h
	Source/Core/VideoCommon/Src/VertexLoader.cpp
 2013-03-04 15:47:56 -06:00
Jordan Woyak
814c2ffdfd Fix some leaking file handles and buildfix probably. 2013-03-03 19:20:35 -06:00
Jordan Woyak
989f0663eb Make "Crypto" file opening unicode-safe on Windows. 2013-03-03 19:14:13 -06:00
Jordan Woyak
c07b8a6e37 Fix more of what I broke. 2013-03-03 17:08:41 -06:00
Jordan Woyak
aeb4fc9846 Fix what I broke. 2013-03-03 02:12:24 -06:00
Jordan Woyak
6c8adf6130 Eliminate the wstring game name. 
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.

Non-windows OSes temporarily broken.
 2013-03-02 20:00:36 -06:00
Jordan Woyak
2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
Jordan Woyak
2356e5c0e7 Eliminate some baseless restrictions in PointerWrap, mainly vector<string> not working. 2013-03-02 03:32:30 -06:00
Jordan Woyak
b0630790c1 It's 2013! Why can't I use C++11 yet!? 2013-02-28 19:42:29 -06:00
Jordan Woyak
dea1e2827d Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06:00
NeoBrainX
1c9860246c Build fixes for everyone! 2013-03-01 01:14:10 +01:00
NeoBrainX
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
Pierre Bourdon
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
Jordan Woyak
e82d976d2f Buildfix for non-legacy OSes. 2013-02-27 20:55:19 -06:00
Jordan Woyak
65683ebc64 Hopefully fix all filename handling to support Unicode. 2013-02-27 20:03:06 -06:00
Jordan Woyak
69f7671ee8 Fix "Common" to build with "Unicode" project setting. 2013-02-27 19:19:38 -06:00
Jordan Woyak
0ea458b4dc Add functions for converting between UTF-8/16. 2013-02-27 18:00:42 -06:00
Ryan Houdek
f1d727cf13 Merge latest ArmEmitter changes from ppsspp while we're at it. 2013-02-27 11:53:24 -06:00
Ryan Houdek
8c779bb242 Ah. I blame vim on this typo entirely. 2013-02-27 10:26:32 -06:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
degasus
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
degasus
90ff648d00 shader cache based by git revision 2013-02-26 10:48:19 +01:00
Jordan Woyak
bd14ad5300 Merge branch 'master' into vertex-loader-cleanup 2013-02-25 17:55:44 -06:00
Jordan Woyak
46adbfa9ed Merge branch 'real-wiimote-scanning' 2013-02-25 17:33:34 -06:00
Matthew Parlane
c30b8c9eae Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
 2013-02-23 17:02:58 +13:00
Jordan Woyak
6a13a4e5ed Add template "swap" function to CommonFuncs. 2013-02-20 20:20:53 -06:00
Jordan Woyak
e9232280c4 Fix OSX! 2013-02-20 17:35:41 -06:00
Jordan Woyak
f3e91bc10d Hopefully kill a stupid warning on Windows. 2013-02-20 17:30:34 -06:00
degasus
a629dea4dc Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
 2013-02-18 18:49:20 +01:00
Jordan Woyak
fa9aafeed8 Some cleanup of CWII_IPC_HLE_Device_FileIO: 
The real file was never kept open for longer than a single operation so there was no point in dealing with it in DoState.
Saving the real path in the savestate was also probably a bad idea. Savestates should be a bit more portable now.
 2013-02-17 13:37:01 -06:00
Jordan Woyak
3330842505 Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time. 2013-02-17 01:33:22 -06:00
Jordan Woyak
206fdde933 Remove the core count from the cpu info OSD message. It was often wrong and not rather important. 2013-02-16 23:48:20 -06:00
Jordan Woyak
53aec6c476 Fix OGL perf queries and make them not slow! 2013-02-16 19:30:24 -06:00
Matthew Parlane
3d480c088f Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
 2013-02-09 20:13:11 +13:00
Jordan Woyak
8ce58759e3 Remove some old nonsense. 2013-02-07 23:52:50 -06:00
Glenn Rice
f7fa33f2d6 Fix remaining compiler warnings. 2013-01-31 15:29:29 -06:00
Matthew Parlane
bca2cac640 keys.bin support added. 
Remove hollywood id from config.
Tidy HLE_Device_es.h (maybe)
Added const params to crypto stuff.
 2013-01-29 01:18:53 +13:00
Matthew Parlane
2dd077028f Merge branch 'master' into wii-network 2013-01-28 22:00:47 +13:00
Matthew Parlane
ca4ea817e0 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.h
	Source/Core/Core/Src/HLE/HLE.cpp
	Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
 2013-01-26 21:46:12 +13:00
Matthew Parlane
a354f47f98 Fixes for POLL on Linux and Mac. 2013-01-26 18:22:58 +13:00
degasus
d60cc373d1 Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae" 
This reverts commit d0301ca89d.

Conflicts:
	.gitignore
 2013-01-24 16:11:07 +01:00
lioncash
2db0c4270e Fix a potential memory leak on non-windows systems. 
Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp
 2013-01-24 08:21:08 -05:00
Rachel Bryk
196c2867ad Move DSP settings to dolphin.ini 2013-01-16 20:17:44 -05:00
Jordan Woyak
3cb4300439 Merge branch 'external-theme' 2013-01-16 19:00:19 -06:00
skidau
0a4272c96b Merge branch 'OpenAL' 
* OpenAL:
  Changed SoundTouch to use float samples, allowing SSE to be used. Made the DPL2 decoder disabled by default. Re-added the audio hack used by the Accurate VBeam emulation option.
  Added a latency setting to the audio settings. Removed the Sample Rate setting.  It is now hardcoded to 48000hz (accurate audio timing).
  Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows.
  Removed the synchronisation between the CPU thread and the audio thread. Added code to detect and resume from buffer underruns. Disabled the ability to change the DPL2 option after the game has started. Fixed a memory leak that occurred in the DPL2 decoder. Fixed the OSX build.
  Build fix
  Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend.  DPL2 audio is decoded to 5.1.  Code adapted from ffdshow. Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system. Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
  Removed the system timing hack which was activated when the Accurate VBeam option was enabled.
  Fixed the include directories in Audio Common for the Windows 32bit build.
  Fixed the include directories in Audio Common for the Windows build.
  Messed up the static include line
  Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
  OSX: typedef signed char BOOL
  OSX build fix
  Build fix
  Added audio time stretching by using the SoundTouch library.
  Implemented correct audio timing.
  OpenAL for Windows initial commit
 2013-01-15 22:40:12 +11:00
Jordan Woyak
a9ff3709e4 Attempt to make file searching stuff less crappy on Linux. 
Supports a * search now.
 2013-01-13 15:32:26 -06:00
Jordan Woyak
6f7b11b9be themes directory stuffs 2013-01-13 14:12:19 -06:00
Matthew Parlane
6e58c50065 Merge branch 'master' into wii-network 2013-01-13 15:13:56 +13:00
Lioncash
dfc0c4b08d Fix two signed/unsigned mismatch warnings. 
Also tidied up SDCardUtil - made the variables make more sense (typewise)
 2013-01-11 19:38:04 -05:00
Matthew Parlane
465df943a5 Merge branch 'master' into wii-network 2013-01-12 00:01:27 +13:00
Matthew Parlane
9754fda516 Merge branch 'wii-usb' into temp merge branch 
Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
 2013-01-11 23:07:12 +13:00
Jordan Woyak
51a1d4cde7 Revert "Very tiny cleanup of ChunkFile.h." 
int/size_t change without updating the rev# caused crash on Dolphin start

This reverts commit cf942450e0.
 2013-01-10 17:41:12 -06:00
lioncash
cf942450e0 Very tiny cleanup of ChunkFile.h. 
Also changed the size parameter from DoVoid to size_t. As far as I know, that should never be negative.

Also changed the the count parameter of DoArray to size_t, this also should never be negative.

Got rid of some typecasts.
 2013-01-10 17:38:38 -05:00
Jordan Woyak
4f4aa4860d Fix a currently unused unique_lock function. Thanks to Lioncash. 2013-01-08 16:50:09 -06:00
Jordan Woyak
baa29f571c Fix incorrect iterator usage in BreakPoints::Clear 2013-01-08 15:02:50 -06:00
NeoBrainX
4925a28f94 PixelShaderGen: Shader uid maintainance 2013-01-08 18:56:01 +01:00
NeoBrainX
b06f30f845 Remove the per pixel depth option. 
Depth calculations are always done in the pixel shader now.

Due to the unpredictability of our zcomploc hacks this commit probably changes the behavior of some games which use zcomploc.
 2013-01-08 18:16:48 +01:00
NeoBrainX
876eee5e60 PixelShaderGen: Don't disable depth texture emulation if z writing is disabled (this is what VideoSoftware is doing). 2013-01-08 18:16:48 +01:00
Matthew Parlane
e8624cc0f2 Merge branch 'gdbstub' into wii-network 
Conflicts:
	Source/Core/Core/Src/ConfigManager.cpp
 2013-01-08 21:21:05 +13:00
Matthew Parlane
5b96fb766f Merge branch 'master' into wii-network 2013-01-08 21:18:48 +13:00
Matthew Parlane
0ec7ef4b99 Merge branch 'master' into gdbstub 2013-01-08 20:27:34 +13:00
Ryan Houdek
d0301ca89d Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06:00
skidau
6df1dacca8 OpenAL for Windows initial commit 2013-01-07 12:16:04 +11:00
Matthew Parlane
b7fd1225ba Started gdb stub support. 2013-01-06 23:28:27 +13:00
Matthew Parlane
67d0e66af4 Add generate id support. 
Add hollywood id to config file.
SSL and WC24 have their own logs now.
 2013-01-04 22:36:44 +13:00
Glenn Rice
9b51c99c6b Make sure the null character is not included in the string. 2013-01-03 19:49:19 -06:00
Glenn Rice
12a606501c Fix the name and description truncation issue in a cleaner way. 2013-01-03 19:21:20 -06:00
Glenn Rice
3da05af30a Fix truncated names and descriptions in the game list on linux. 2013-01-03 10:35:07 -06:00
Matthew Parlane
e0c9a1fd09 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
 2013-01-01 23:28:46 +13:00
Matthew Parlane
d3f199273b Fix warning level... someone let me commit this to master ;D 2013-01-01 19:23:45 +13:00