bab91494d5
Merge branch 'master' into android-core-control
2013-09-23 00:47:57 -05:00
1da6469c62
[Android] Use new 4.0 icon.
2013-09-23 00:25:34 -05:00
4d3c41c8a2
Fixed issues with feild ordering.
...
This commit fixes issues with PAL games which use the incorrect feild
ordering.
We move all code that deals with indivudal fields from the indivudal
video plugins and VideoCommon and make VideoInterface always pass in
the start address of the whole XFB into VideoCommon.
2013-09-23 16:31:27 +12:00
c8c83f7b8a
Remove FifoQueue iterator and RemoveThreadsafeEvents.
...
No point making a whole iterator class for the sake of a function that
doesn't need to exist.
2013-09-22 23:14:42 -04:00
0a093cf1b9
Why do compilers assume i don't know order of opperations? :(
2013-09-22 22:01:25 -04:00
e82c9e616d
operator= is a function too! std::forward is still appropriate.
...
Fix the potentially unsafe use of std::move I added to FifoQueue.
2013-09-22 21:15:58 -04:00
af7ed820f5
[Android] Add a JP version of the string for FSAA. Also correct the English string too.
2013-09-22 19:16:32 -04:00
573dbfd494
ogl: drop glsl120 support
2013-09-22 23:45:14 +02:00
12e7c22006
Fix recording netplay with wiimote.
2013-09-22 17:32:11 -04:00
80b14e80b5
Fix crash when a player leaves in NetPlay.
...
The player ID was being written as int and read as PlayerId (u8).
2013-09-22 16:12:16 -04:00
229b35bb6d
When hosting, don't try to connect if listening failed.
...
If another instance of the server is running on the same computer, this
would cause Dolphin to confusingly connect to it.
2013-09-22 16:11:47 -04:00
17e753faf3
Fix FifoQueue's atomicity on ARM.
...
Theoretically.
2013-09-22 16:08:09 -04:00
c3b9f3556f
Make CoreTiming's threadsafe events lock-free.
...
Not sure if this actually helps in practice, but might help in
pathological cases, and almost certainly can't hurt.
2013-09-22 16:08:01 -04:00
7fe440340f
Improve Atomic.h:
...
- For GCC, use intrinsics that will work on ARM.
- Add AtomicExchangeAcquire.
- Make Atomic{Load,LoadAcquire,Store,StoreRelease} work for any suitable type.
2013-09-22 16:07:45 -04:00
6209067daa
Fix stack misalignment fix.
2013-09-22 15:48:27 -04:00
9a6f28fce4
Revert "Fix stack misalignment issues."
...
This reverts commit d334a9bc23
2013-09-22 14:29:35 -04:00
f3469c16a5
Merge branch 'wiimote-netplay'
...
Conflicts:
Source/Core/Core/Src/NetPlayClient.cpp
Source/Core/Core/Src/NetPlayClient.h
Source/Core/Core/Src/NetPlayProto.h
Source/Core/Core/Src/NetPlayServer.cpp
Source/Core/Core/Src/NetPlayServer.h
Source/Core/DolphinWX/Src/NetWindow.cpp
Source/Core/DolphinWX/Src/NetWindow.h
2013-09-22 14:27:52 -04:00
bdae5d1027
[Android] Fix typo, FSAA stands for full scene antialiasing.
2013-09-22 11:59:10 -05:00
6340ad68be
Merge branch 'GLES3-FSAA'
2013-09-22 10:00:51 -05:00
75129dc3a7
Merge branch 'to-merge-after-4.0'
2013-09-22 10:58:24 -04:00
81effb8099
[Android] Add in FSAA option.
2013-09-22 09:25:38 -05:00
91619e28b8
Pull in the glRenderbufferStorageMultisample function pointer at run time.
2013-09-22 09:10:47 -05:00
323ecdb772
Ship vcomp100.dll with Dolphin
2013-09-22 16:00:56 +02:00
1f95a294cd
Add the new 'Clean' themes from MaJoR and default to Clean by changing the name of the config key (yes, hack)
2013-09-22 16:00:56 +02:00
196953c50a
Use the new Dolphin icon
2013-09-22 16:00:39 +02:00
53b93f8cd5
Allow GLES3 hardware to support FSAA. Need a GUI option for this on Android devices.
2013-09-22 13:54:47 +00:00
eb2e3cff7e
D3D11: Create temp EFB texture with correct multisample mode. Fixes issue 6482.
2013-09-22 13:15:57 +02:00
4758ef9a9e
Merge commit 'fa8a4cdbb57e'
2013-09-22 15:25:10 +12:00
f9b0b0471b
D3D11: Fix various MSAA related issues.
...
How did any of this ever work? >_>
2013-09-22 02:52:39 +02:00
91c0e02609
Don't require running Dolphin in the directory that contain Languages/ on Windows
2013-09-21 21:17:47 +02:00
d321aa7e7a
Pull in translations from Transifex.
2013-09-21 11:24:33 -05:00
1fb373f439
Stop dolphin from loading help.png
...
It was never used, just wasting time and resources.
This patch simply deletes two lines of code.
2013-09-21 06:34:50 +02:00
d2c3222fcc
Fix copying Sys/Wii to User/Wii on startup.
...
Fixes issue 6621.
2013-09-21 00:34:19 -04:00
d334a9bc23
Fix stack misalignment issues.
...
- Call ABI_AlignStack even on x86-64.
- Have ABI_AlignStack respect the difference in current alignment
between the root JIT function, which has a prolog, and
ProtectFunction thunks, which do not. This was causing many games
to crash on start on OS X. Since this might otherwise mean changing
the stack pointer before every call...
- Have one prolog/epilog function rather than two (one of which
definitely did not do what it was thought to do), and make it
actually work like a normal one, so that the stack frame shows up
properly in the debugger. There should be no performance impact.
2013-09-20 16:46:48 -04:00
95aac4ff68
if a memcard is set to read only, fail more gracefully by reporting when writes to the file fail instead of saying that the file does not exist.
2013-09-20 12:08:58 -07:00
86d70cee15
Turns out CVTSD2SI in x64Emitter.cpp should actually use 64 bits instead of 32. Thanks for pointing that out hk.konpie.
2013-09-20 14:50:27 -04:00
49fff7979b
[Android] Make the FolderBrowser extend a ListFragment instead of a regular fragment. Lets us get rid of the need for an AdapterView.OnItemClickListener when handling list item clicks. Simplifies the implementation of the FolderBrowser a tiny bit.
2013-09-18 22:17:23 -04:00
85f067780a
[ARM] Reenable flush per instruction with FPR cache. Something is still very wrong.
2013-09-19 02:08:20 +00:00
930f997f04
[ARM] Fix and optimize mtcrf.
2013-09-19 02:08:19 +00:00
1b1b5d2100
[ARM] MicroOps in the branching instructions.
2013-09-19 02:08:19 +00:00
5158aea4dc
[ARM] Fix misuse of RBIT in crXXX, meant to use MVN.
2013-09-19 02:08:19 +00:00
dc73222bfc
Remove suggestion to restart dolphin if a wiimote movie desyncs, since it's no longer necessary.
2013-09-18 21:51:37 -04:00
ae607ea1e9
Fix missing md5thread.detach()
2013-09-18 21:48:23 -04:00
452fd84bbd
[ANDROID] Fix ARM JIT. Is due to Android using softfp instead of hardfp.
2013-09-18 17:21:22 -05:00
6fc2117503
[ARM] Enable VMOV to move from double VFP reg to two ARM registers.
2013-09-18 17:21:22 -05:00
af951f467e
[InputCommon] Fix a bug in ControllerInterface::UpdateOutput() in ControllerInterface.cpp. The variable ok_count was never incremented, which caused the function to always return false.
2013-09-18 10:09:32 -04:00
d03fb11188
Fix an incorrect opcode for an SSE instruction in x64Emitter.cpp. CVTSD2SI should write 0x2D, not 0xF2.
...
Also format the NormalSSEOps enum.
2013-09-18 07:43:31 -04:00
86f6e8cc1e
Better fix for issue 6614: ISOProperties should store integer settings for PHack booleans. INIFile is stupid, please kill it with fire.
2013-09-18 12:33:57 +02:00
7aa98a3830
Fix loading of the 'projection hack enabled' gameini setting
...
Fixes issue 6614.
2013-09-18 12:23:46 +02:00
28f2bd310d
ogl: don't PanicAlert on shader compiler warnings
2013-09-18 11:47:44 +02:00
24a44ecfb8
[ANDROID] Add two new DriverDetails bugs for Adreno. V45 of the driver has broken shader compilation with UBOs in the shaders, this is most likely fixed with V53 found in the Nexus 5. Add a bug for issue surrounding on screentext and doing a glClear after swap causes screen swizzling and zero frames rendered respectively. On the Java side, pass in the dimensions of the screen swapped since there is an issue with Adreno where it rotates the output 90 degrees for some reason. Disable the GLSL shader cache on Android for now due to the inability to cleanly exit the emulator, this tends to cause the cache to get corrupted. All this together fixes rendering with Adreno 3xx GPUs with driver version v14 and above. In particular my Galaxy S4 still resets with this without the root commands, but my HTC Droid DNA and LG G2 is fine. This must be due to particular 'enhancements' that the Samsung kernel has over the other ones. The speed on Adreno has yet to be optimized, so it will most likely be slow still. Faster than the software rasterizer in any case. The ARMJIT is still broken in at this point, so not much fun can be had.
2013-09-18 02:37:10 -05:00
db7f8697ba
[Android] Use a simpler "startActivity()" call in DolphinEmulator.java. Turns out the other one isn't 4.0 compatible, but actually only 4.1 and up. Also, in this case, we really don't actually care about the saved instance state bundle.
2013-09-18 01:57:01 -04:00
197b317357
Fix indentation in function PSO_MakeSaveGameValid() in GCMemcard.cpp.
...
Also move the iterator variable for a for loop into the loop statement in function CARD_GetSerialNo()
2013-09-17 21:27:37 -04:00
6cc30f3b23
Revert "ogl: change the default buffer upload on osx+nvidia"
...
This reverts commit 3b0b5155e8
2013-09-18 02:23:47 +02:00
39a8645ffc
[ARM] Fix the FPR cache to not have to dump registers after every instruction. Add mullwox instruction.
2013-09-17 22:08:23 +00:00
06062d5744
[ARM] Fix VSQRT/VCMP/VCMPE/VCMPE0/VCMP0 emitters when using the high 16 double registers.
2013-09-17 22:08:23 +00:00
ec9c395f4f
Add WBFS to the file extensions supported by Dolphin on OSX
2013-09-17 16:50:44 +02:00
e34d8aee1d
Add * to the characters leading a verbatim line (used in Gecko codes comments)
2013-09-17 16:50:44 +02:00
47ce3dd09d
Really fix reading projection hacks from game inis.
2013-09-17 10:44:47 -04:00
e3d01de01d
Fix reading projection hack from game inis in ISOProperties.
2013-09-17 10:40:12 -04:00
ec5cf60f5e
Set L/R buttons in tas input, instead of just the analog triggers.
...
Fixes issue 6613.
2013-09-17 09:56:45 -04:00
302e9c891b
[ARM] crand/crandc/creqv/crnand/crnor/cror/crorc/crxor/mcrf/mfcr/mtcrf/mtsr/mcrxr/mfsr implementations.
2013-09-17 11:00:16 +00:00
dcf74ef2b3
[ARM] Renables load instructions with update.
2013-09-17 11:00:15 +00:00
988544389a
[Android] Slightly change the layout of the AboutFragment. Looks more like an actual list view now.
2013-09-16 22:04:59 -04:00
b4883e2ada
[Android] Make the AboutFragment extend the ListFragment, since this is basically what this fragment acts as. Much more descriptive than simply extending Fragment.
...
Also made the list non-clickable, since it isn't supposed to be interacted with.
2013-09-16 21:04:58 -04:00
38c7d38800
Fix two wrong opcodes in the x64Emitter. PEXTRW and PINSRW were actually writing PCMPGTB opcodes. Thanks for the help Sintendo.
2013-09-16 15:59:31 -04:00
1529bb48c8
[ARM] Flush the fpr cache between every instruction. Do this until I figure out what is destroying the FPR register states.
2013-09-16 15:44:41 +00:00
7397867b21
[GLES3] Enable support for primitive restart.
2013-09-16 15:43:57 +00:00
9b9526fba2
[ARM] Add dcbt/dcbtst/dcba noops.
2013-09-16 15:13:37 +00:00
75f2738f5c
VideoCommon: fix ogl lighting bug which happens because of NaN emulation
...
attn is sometimes very big (eg 1e27), so attn*attn doesn't fit into a float.
So the funny part here is: 0.0 * (1e27*1e27) = 0.0 * Inf = NaN
As the shader compiler is allowed to change the order of multiplications,
this issue isn't fixed completely.
2013-09-16 17:10:19 +02:00
98fb4c146e
[ARM] ps_sel implementation.
2013-09-16 14:05:50 +00:00
cba2dd01bc
[ARM] Remove extraneous BKPT from ps_rsqrte.
2013-09-16 13:39:02 +00:00
a0a0c526ae
[ARM] ps_rsqrte implementation.
2013-09-16 12:59:34 +00:00
7d410ec95c
[ARM] VRSQRTE NEON emitter.
2013-09-16 12:58:20 +00:00
5a9cb84ae2
[ARM] ps_nmadd/ps_nmsub implementations.
2013-09-16 12:03:08 +00:00
b7f47bc2e1
[ARM] rlwnmx implementation.
2013-09-16 11:53:22 +00:00
43f2313ef9
[ARM] Implement ps_msub. Minor optimizations.
2013-09-16 11:53:21 +00:00
afdac224cb
Prevent an error message from erroneously displaying when dumping frames in d3d9 or d3d11.
2013-09-16 06:31:47 -04:00
1b5f904438
D3D11: Fix screenshot aspect ratio.
...
Fixes issue 6527.
2013-09-16 12:13:58 +02:00
0bcc20ca5b
[ARM] fcmpo/fcmpu implementations.
2013-09-16 08:57:51 +00:00
c56ecce840
[ARM] fctiwzx implementation. This isn't implemented in JIT64 and it is unstandeable why it isn't.
2013-09-16 07:49:16 +00:00
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
f0fc611f15
Add a hacky check for text file size in ReadFileToString. Fixes issue 6455.
2013-09-16 06:57:44 +02:00
a7e1fb81b1
Merge branch 'wad_gamenames'
2013-09-15 21:38:31 -07:00
037199c326
Look for portable.txt in the exe directory and activate portable mode if it exists
2013-09-16 05:46:07 +02:00
2c350a5e6b
Fix INIFile ignoring the last line of files
2013-09-16 05:28:14 +02:00
449cd3b267
[Android] No need to use startActivityForResult in DolphinEmulator.java any more. Just some leftover stuff from the big refactor.
2013-09-15 22:11:17 -04:00
5a0f0b908e
[Android] Fix the name of the parameters in some unused interface methods.
...
There are some interface methods that are simply stubbed for the time being. It would be better to give the parameters better names despite not being used.
2013-09-15 14:34:30 -04:00
b4c082f1b3
No, i don't check what i committed before pushing to master, one week before a release.
...
Fixes a mistake from 550c855ae6
2013-09-14 22:58:32 -04:00
550c855ae6
Create blank ini file before editing it, if it doesn't already exists. This prevents the editor from prompting to create it.
2013-09-14 20:30:42 -04:00
5d202ae9ea
proper fix for issue 6206
2013-09-14 15:09:58 -07:00
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
4ef5624f1f
Change the name of INI options for memcard paths and NAND path to make migrating User directory from non-global to global easier
2013-09-14 17:46:41 +02:00
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
e56071f2be
[ARM] slwx/srwx/srawx implementations.
2013-09-14 09:07:34 +00:00
81d7986202
[ARM] Add LSRS emitters, and ASR{S} register emitters. Fixes encoding in LSR emitter.
2013-09-14 09:06:49 +00:00
53498dafeb
[ARM] fmaddsx and fmaddx implementations.
2013-09-14 05:52:09 +00:00
be4277e8a1
[ARM] stmw implementation.
2013-09-14 05:16:18 +00:00
c211d06ad2
[ARM] stfd and stfdu implementations.
2013-09-14 05:09:46 +00:00
6fe86f1fd1
[ARM] cntlzwx implementation.
2013-09-14 04:29:37 +00:00
ef2ea31eac
[ARM] ps_madds0 and ps_madds1 implementations.
2013-09-14 04:12:57 +00:00
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
d1e96c7282
Display warning OSD messages when a game ini is overriding any settings.
2013-09-14 06:08:31 +02:00
aa202c2e21
Move global gameinis from User to Sys. Get rid of SHARED_USER.
2013-09-14 06:08:30 +02:00
86e765f3eb
Move Themes/ from User to Sys. Only Gameinis remain.
2013-09-14 06:08:30 +02:00
91a758b342
Move TextureDecoder.cl from User to Sys
2013-09-14 06:08:30 +02:00
c3eec379df
Move global User/Wii to Sys/Wii
2013-09-14 06:08:30 +02:00
e7213ca4b1
Overlay the user Shaders/ over the shared one to avoid copying files
2013-09-14 06:08:30 +02:00
6bdb6585d6
Overlay the user Maps/ over the shared one to avoid copying files
2013-09-14 06:08:29 +02:00
b587af3ea3
Change the initial user directory creation to stop special casing Windows
2013-09-14 06:08:29 +02:00
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
4512813cf9
[ARM] lfdu and stfsu implementations.
2013-09-14 04:00:40 +00:00
0ae8fa964d
[ARM] lfsu implementation.
2013-09-14 03:51:32 +00:00
aaf8e92f78
[ARM] Fixes srawix implementation.
2013-09-14 03:00:33 +00:00
751fae4965
[Android] Make sure the default config file has fastmem disabled.
2013-09-13 21:17:40 -05:00
f830b85d10
NetPlayServer: Drop all the pads for a client when she disconnects
...
This makes intuitive sense, and prevents issues with users stealing
up all the pads and requiring admin intervention to participate.
2013-09-13 21:33:11 -04:00
0040e66282
Merge branch 'geckoos-fix'
...
Fixes issue 6551.
2013-09-13 18:18:51 -04:00
e15e30602c
Fix HLE_HOOK_START in the interpreter.
2013-09-13 18:18:20 -04:00
e62bc44f15
Use d01f1bad for the gameid check in RunCodeHandler rather than the actual ID.
...
This avoids conflict with the icache hack. codehandleronly.s does not
actually use the gameid, so it shouldn't matter.
2013-09-13 18:14:56 -04:00
e6cd3b3283
Fix placement of HLE::Patch to not get overwritten by HLE::PatchFunctions.
...
(This applies to the existing HBReload hook, which would be erased in
various circumstances depending on the type of file loaded.)
2013-09-13 15:31:51 -04:00
a316e2f182
Hook the Gecko codehandler to invalidate the icache.
...
The codehandler is broken and does not do this itself. This is a hack,
but a lot simpler than the alternatives.
2013-09-13 15:31:51 -04:00
354b205dec
Return correct value to fix libogc's IOS launch sequence.
2013-09-13 15:31:50 -04:00
1f8237c570
Fake ticket views for missing IOS title.
2013-09-13 15:31:50 -04:00
868ab1918b
Reset es_inuse upon Reset.
2013-09-13 15:31:50 -04:00
39a524f47d
Returning false from an IPC_HLE method should not produce an INFO_LOG.
...
It's commonly used to delay replying to a message and is in no way an
error.
2013-09-13 15:31:50 -04:00
7a15159c34
[Android] Explicitly set the defaults for the CPU settings.
2013-09-13 00:29:59 -04:00
0490d7d59c
[Android] JP strings for the Fastmem option.
2013-09-13 00:24:06 -04:00
ba05db7828
[Android] Add a fastmem option to the cpu options, default disabled.
2013-09-12 23:08:00 -05:00
1680f27739
[ARM] Disable loadstorepaired instructions when fastmem is disabled.
2013-09-12 23:07:19 -05:00
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
44066326ff
Hack the gettext detection a bit to fix translations not working on OSX buildbot builds
2013-09-12 18:22:31 +02:00
c1ddeacc9d
[ARM] Removes extraneous fpr.Flush
2013-09-12 10:31:29 +00:00
aa8f0c2ca4
[ARM] Fixes ps_madd implementation.
2013-09-12 10:30:52 +00:00
8882d27689
[ARM] Fixes the ps_merge00 and ps_merge10 implementations. They both had the potential to overwrite the source registers in the moves.
2013-09-12 10:17:27 +00:00
749b62fcd9
[ARM] Fixes orcx implementation.
2013-09-12 09:55:55 +00:00
e1d510c2dc
[ARM] Disables loadstores with update because they are broken.
2013-09-12 09:40:10 +00:00
2c33bab1a6
[ARM] lfsx implementation.
2013-09-12 07:52:19 +00:00
fa5499e046
[ARM] Disable lmw when fastmem is disabled.
2013-09-12 02:51:38 -05:00
acbdcc8ea0
Use the POLARSSL_LIBRARY variable to set the link library. This fixes a
...
possible linkage issue when multiple versions of the library are around.
2013-09-11 22:09:49 -05:00
b9c1af04ad
Replace the one use of CompileTimeAssert with static_assert (already used elsewhere).
2013-09-11 20:58:47 -04:00
9ee50a2730
Merge branch '6584'
...
Fix for XP and lifetime issues on Mac. Fixes issue 6584.
2013-09-11 20:47:27 -04:00
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
ce49964dfe
Fix "modifier" button functionality et al.
2013-09-11 17:48:04 -05:00
3fcdf5e25b
VideoCommon: use memcmp to compare shader uid
2013-09-11 17:34:23 +02:00
3b0b5155e8
ogl: change the default buffer upload on osx+nvidia
2013-09-11 11:02:09 +02:00
2b10142b4f
Remove a bunch of old HLE junk
...
This hasn't been used since 2008
2013-09-10 22:35:52 -04:00
56686666d6
Fix ES_DECRYPT.
...
ES_DECRYPT is usually called with the in IV parameter equal to the out
IV parameter. Dolphin was preemptively zeroing out the out buffer,
causing it to read zeroes for the IV. (Also be more correct when those
parameters *aren't* equal.)
Dolphin now has the dubious honor of having an exploit (smashstack) work
in it. It crashes in Project M, though.
2013-09-10 17:09:37 -04:00
84db868187
[Android] Android uppercases the name of the tabs in the settings by default. So we don't have to call ".toUpperCase" in the string returns in getPageTitle().
2013-09-10 11:21:13 -04:00
8ceb72612a
[Android] Kick the targetSdkVersion in the AndroidManifest XML file to 18. Since this app basically works on 4.x.x, we don't need to make compatibility modes kick in for anything above 4.0.0.
...
Also very minor cleanup to the XML.
2013-09-10 09:29:05 -04:00
ce5f80b151
[Android] Give the exceptions in compareTo implementations in GameListItem and FolderBrowserItem some messages. If the exceptions ever actually get thrown, at least you're given a reason as to why the exception was thrown now. Also changed the exception type to NullPointerException. IllegalArgumentException is intended to be used for validating the parameters in constructors/methods.
2013-09-10 08:32:11 -04:00
Ryan Houdek