Commit Graph

9618 Commits

Author SHA1 Message Date
comex 872e9ce3da Add accidentally omitted code in last commit.
(m_wiimote_thread_run_loop was being used but not set, causing
Wiimote::IOWakeup to crash on OS X; todo rebase this)
2013-09-04 04:39:18 -04:00
Ryan Houdek 5696da0b3e Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay."
This reverts commit e110f1049c.

This unfixes issue 6575. Reverted due to huge performance hit on behalf of JMC.
2013-09-04 02:55:13 -05:00
comex 02fc68ea5d While we're at it, explicitly wake up the Wiimote thread rather than using a 1s timeout.
This only matters if reads are not constantly being completed by
reports anyway, but seems like a good idea.
2013-09-04 03:25:05 -04:00
comex 906de748bd Refactor thread handling to fix OS X bug.
On OS X, openL2CAPChannelSync registers events on the current
thread's run loop, so Connect needs to be called on a thread that's
going to do CFRunLoopRun; this was causing all Wiimote input to be
ignored.  Easiest way to do that is to use the Wiimote thread, and
have Read call CFRunLoopRun to block on events, bringing OS X's
Wiimote event loop in line with every other platform's.  This also
means that the thread can't be stopped and recreated by Prepare,
so make Prepare notify it instead, which has the side effect of not
making the GUI block on Prepare.  (It would be nice if the GUI also
did not block on searching for devices, because blocking the GUI
is gross, but for now...)
2013-09-04 03:24:00 -04: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 0e949afa57 Remove dubious retain on OS X.
Revert this if the claimed crash actually shows up - or better, figure
out the actual cause.
2013-09-04 01:11:04 -04:00
comex e0214b1a38 Fix syncing wiimotes on OS X.
IOdarwin.mm was assuming that scanning was complete when the run loop
was stopped (which the scan callback does), but somebody else was
stopping the run loop first, causing the scan to be aborted.  Wait until
the scan is actually complete.
2013-09-04 01:04:51 -04:00
comex 1ea8b93667 Fix typo in log message in WII_IOB.cpp. 2013-09-04 00:03:05 -04:00
Ryan Houdek 7e26aace9f [ARM] Reenable ps_add. Issue is due to something in the FPR cache. Still needs to be investigated. 2013-09-04 03:27:45 +00:00
Ryan Houdek 8684b7635a [ARM] Reimplement fastmem for the few loadstores that had it before. 2013-09-04 02:07:57 +00:00
Rachel Bryk e9ffba7ab8 Don't ever ever let CFrame::DoStop() run twice at the same time. 2013-09-03 18:53:23 -04:00
Justin Chadwick e110f1049c [NetPlay] Make the Memory Card A/B setting sync across netplay.
Fixes issue 6575.
2013-09-03 17:41:52 -04:00
Lioncash 70cfe96492 [Android] Fix an accidental call to the wrong method in the superclass of EmulationActivity. Should have been returning "super.onMenuItemSelected(itemId, item)" instead of "super.onOptionsItemSelected(item)". 2013-09-03 17:25:45 -04:00
Rachel Bryk 8ae10b3e12 [NetPlay] Allow recording movies during netplay.
Fixes issue 6207.
2013-09-03 15:50:41 -04:00
degasus 7e1959a200 ogl: remove obsolete code 2013-09-03 18:51:30 +02:00
degasus 0255e13912 ogl: disable revision 737df2a68c for desktop ogl
texelFetch doesn't filter linear, so every copy with filters didn't work correctly. This is still the case for gles, but this will be fixed after the 4.0 release.
Fixes issue 6465.
2013-09-03 17:36:55 +02:00
Lioncash 4f72671d32 [Android] Change the documentation of the FolderBrowser class. We don't show invalid items anymore. 2013-09-03 07:05:02 -04:00
Ryan Houdek 39ad48dfa5 [ARM] lmw implementation. 2013-09-03 09:55:15 +00:00
Ryan Houdek 30cd436e86 [ARM] Merge load instructions in to one. Also rapid prototype 13 more load instructions. This disables fastmem currently for loads. 2013-09-03 09:22:43 +00:00
Ryan Houdek d4d6eb562e [ARM] Fix and enable fastmem for 32bit stores. 2013-09-03 05:05:10 +00:00
Ryan Houdek cc2fa4a003 [ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this. 2013-09-03 04:11:25 +00:00
Ryan Houdek dfce0f3b0b [ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this. 2013-09-03 04:08:15 +00:00
Justin Chadwick 6b1c8f9d17 [Netplay] Read dual core setting before syncing it with clients.
Fixes issue 6573.

Fixes issue 6535.
2013-09-02 19:55:25 -04:00
comex 5b9254a1cd fix android. 2013-09-02 17:30:31 -04:00
comex 50520c7c3d Make fastmem work under a debugger on OS X.
Not only do debuggers catch the expected SIGSEGV by default, I'm not
sure there's a working way to configure either gdb or lldb not to.  This
commit uses an OS X-specific mechanism to add an exception handler that
runs before the default one.
2013-09-02 17:26:32 -04: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
Lioncash e198e201e4 [Android] Fix the video settings from crashing the app. Was broke in the commit "Removal of my terrible idea"
https://code.google.com/p/dolphin-emu/source/detail?r=2897619ddbd3e3aae8427fc503647c65e770d466

Didn't comment out the line for that preference in the XML. This is disabled for now until the UI overlay for the buttons are implemented directly into the Java front-end.
2013-09-02 11:00:22 -04:00
Ryan Houdek a7f3264fed [ARM] Merge a bunch of arithmetic JIT instructions and rapid prototyping of a bunch more. 2013-09-02 14:15:37 +00:00
degasus 1b1cc82e5b rename vertex streaming hack tooltip
String is copyed from issue 6552.
2013-09-02 13:33:36 +02:00
degasus beb57d7fbd ogl: reorder driver extensions checks 2013-09-02 13:14:45 +02:00
Ryan Houdek 2897619ddb Removal of my terrible idea. 2013-09-02 05:31:48 -05:00
Ryan Houdek e7157e7c52 [Android] Fix fastmem and enable. 2013-09-02 04:10:21 -05:00
Ryan Houdek 679957dc98 Fix Non-GLES run path in videosoftware for the previous commit. 2013-09-02 01:44:46 -05:00
Ryan Houdek 831963616f [Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really. 2013-09-02 01:40:05 -05:00
Lioncash 0219049c03 Fix an accidental duplicate if-statement handling of 0x1007 in WII_IPC_HLE_Device_net.cpp 2013-09-02 01:28:48 -04:00
comex 35b8dfbe0c A few more warnings. 2013-09-01 23:33:35 -04:00
comex 2630169229 More warnings: mark/avert truncating conversions from float. 2013-09-01 22:59:35 -04:00
comex 4f5729dd59 MSVC warnings. 2013-09-01 22:59:32 -04:00
comex de0a5fdfbb More trivial warning fixes. 2013-09-01 22:59:18 -04:00
comex c08f06f8c9 Fix IOCTLV_SO_GETADDRINFO.
It tried to cast incoming pointers to native ones.  The values are
required to be null anyway, so it doesn't really matter, but it fixes a
warning at least.
2013-09-01 22:58:40 -04:00
comex 186527544b Fix use of deprecated APIs in IOdarwin.mm. 2013-09-01 22:58:38 -04:00
comex 403744dee8 Fix use of deprecated screen resolution API.
(This is currently pointless, as the code in question is not used on OS
X anyway, but I'd like to see that option come back.  In any case, fixes
the warning)
2013-09-01 22:58:35 -04:00
comex fd7cf5bb71 A bunch of trivial changes to fix clang warnings. 2013-09-01 22:58:33 -04:00
Lioncash d41eb76378 [Android] Fix the last commit. On-screen control drawing wouldn't re-enable upon flipping video backends. 2013-09-01 20:36:47 -04:00
Lioncash acf3bd8697 [Android] On-screen controls work for Software Renderer, but not the OpenGL ES 3 video backend yet. Enabled it for Software Rendering and disabled it for Open GL ES 3. 2013-09-01 20:31:45 -04:00
comex 71fde876df A fix to my fix to my fix. Sorry.
(Avoid uninitialized m_pFile when loading WADs.)
2013-09-01 17:15:16 -04:00
Lioncash c092c65d4a [Android] Disable most video preferences if Software Rendering is chosen. Since the software renderer and other renderers have little in common, it doesn't make sense to keep many of the video preferences enabled. 2013-09-01 15:20:15 -04:00
Lioncash 440ae412b0 [Android] Add the option to show the on-screen FPS counter. 2013-09-01 03:07:16 -04:00
Ryan Houdek b03ff7a86b [Android] Fix the game thread never leaving. 2013-09-01 01:10:40 -05: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 5209abeb03 Better error reporting for ES / NANDContentLoader. 2013-08-31 23:49:29 -04:00
Jasper St. Pierre 3e049a130b NetPlay: bump proto
As it changed with the pad mapping change.
2013-08-31 23:29:12 -04:00
Matthew Parlane ffe710b4e8 Recvfrom tidy and store laste error. 2013-09-01 15:15:55 +12:00
Matthew Parlane 1c106abf13 Fix sendto.
This fixes Opera, sorry [SS]
2013-09-01 14:30:07 +12:00
Matthew Parlane b11f14c6f7 Fix setsockopt. 2013-09-01 14:03:03 +12:00
Jasper St. Pierre 22f57cf07a NetPlay: Don't bother with the host's controller settings
Use the pad mapping to calculate the number of devices
we want, and add them on each client when we get the
message.
2013-08-31 21:18:14 -04:00
comex b187a38433 Fix inability to boot NAND contents caused by 04c41c1d38.
Might be nice to refactor this code to decrease duplication, but for now
just a fix.
2013-08-31 15:06:00 -04:00
Pierre Bourdon 751c2e69f6 Add a link to our documentations guides in Dolphin 2013-08-31 10:31:43 +02:00
Matthew Parlane 676d78ec41 Fixes accept.
Tested with network demo from devKitPPC :)
2013-08-31 18:47:19 +12:00
comex 11cffddbf7 Fix a trivial bug in b6728c1405. 2013-08-31 01:54:57 -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
Matthew Parlane c497d62836 Fix sysmenu test connection bug on Windows. 2013-08-31 16:44:53 +12:00
Lioncash 7ce3d846d5 Indent the code in the previous bug fix I did. Now there aren't braces on the same level as each other. Should have initially done this along with that commit. 2013-08-31 00:39:19 -04:00
LPFaint99 199c4e0d78 Merge branch 'wiiSaveExportFixes'
saves like super smash bros brawl, mario kart, etc which use simple copy restriction via the banner file are now able to be imported natively with the wii/wiiU system menu
save files which include subdirs are correctly packaged

NOTE: saves which include 'nocopy'/'nomove' folders will likely always require homebrew

adds feature to export all wii saves
2013-08-30 20:52:09 -07:00
Ryan Houdek df7b4da13b [ARM] Fastmem is back. Still disabled for Android. 2013-08-31 02:33:12 +00:00
Ryan Houdek 8b0a0daf10 Revert "[ARM] Remove Fastmem. It is buggy and may never have the potential to work correctly."
This reverts commit f485d96b0b.
2013-08-31 02:33:11 +00:00
Lioncash 93b0f46d34 Fix a tiny bug in CodeView.cpp. If statement with more than one line was missing braces. 2013-08-30 18:29:03 -04:00
comex b6728c1405 Avoid unnecessary bundle copies on OS X:
- Make "copy data into bundle" depend on the files actually being
  changed, rather than being run on every build.

- postprocess_bundle depends on system files and checking the Dolphin
  binary and all that, and would be iffy to try to avoid rerunning;
  but it's only needed to produce a redistributable bundle, so add
  SKIP_POSTPROCESS_BUNDLE to skip it for development.
2013-08-30 17:54:52 -04:00
Lioncash 51c814f34e [Android] Removed the unnecessary MainActivity generics declaration in the DolphinEmulator class. It's unused (and likely won't be used). 2013-08-30 15:47:04 -04:00
Lioncash c633c2bb13 [Android] Some various cleanups. Also make some class variables final.
Localize some variables as well, and clean up an import.
2013-08-30 15:31:25 -04:00
Pierre Bourdon 6428137ca4 Set XAudio2 as the default audio backend 2013-08-30 19:12:46 +02: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
Pierre Bourdon 2ab7fc10da Rollback "DSP on Thread" to only affect LLE.
Keep the threading code in AX HLE in case we want/need to enable it again at
some point. Not too confident about refactoring it right now.
2013-08-30 09:14:30 +02:00
Ryan Houdek 7cceace1ed [ARM] Fix Savestates. 2013-08-30 06:43:18 +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
Lioncash 0df64775ea Merge branch 'master' of https://code.google.com/p/dolphin-emu into android-savestate-support 2013-08-29 21:57:53 -04:00
Ryan Houdek 10c18e75de [ARM] Fix lfs/lfd. We need to dump the fpr cache at times where VFP registers may be affected. We shouldn't need to flush D8-D15 but it doesn't seem to work. So we have to flush all registers. 2013-08-30 01:11:32 +00:00
Lioncash 90918cdb84 [Android] Remove garbage loggers for when I was debugging why the overlay buttons wouldn't work. 2013-08-29 21:09:38 -04:00
Lioncash dac9659c58 [Android] Preliminary save-state support. Have the UI set up. Crashes with SIGABRT however. 2013-08-29 21:07:17 -04:00
Lioncash b5d5296250 [Android] Accidentally enabled screen rotation in the emulator window. Disabled it. 2013-08-29 19:09:56 -04:00
Ryan Houdek 96394da1c2 [Android] Let NativeLibrary handle initial folder structure creation. 2013-08-29 18:07:32 -05:00
Ryan Houdek 957c263367 [Android] Add save state native functions. 2013-08-29 17:47:50 -05:00
Ryan Houdek 1dcede4d56 [Android] Stop the play store from overwriting buildbot builds. 2013-08-29 22:28:23 +00:00
Lioncash 5a749cc7ca [Android] The back button now toggles the visibility of the action bar in the emulation window. This can be used in the future to implement the overlay for save states and other things. 2013-08-29 18:26:45 -04:00
Lioncash aeec249626 [Android] Decouple the emulation processes from the Main activity. Moved them into their own activity called EmulationActivity. 2013-08-29 17:21:17 -04: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
degasus e685d198bd ogl: only free use fences
This fixes some opengl error when not all fences are created.
2013-08-29 21:03:48 +02:00
Lioncash 335839b27f [Android] Move the instantiation of the NativeGLSurfaceView into a layout file. This will allow the addition of other components in the future, such as overlays, etc. 2013-08-29 13:13:44 -04:00
Lioncash 01764fef67 [Android] Forgot to make the AboutFragmentAdapter class 'final' 2013-08-29 12:45:40 -04:00
Lioncash 8fd2c32ba6 [Android] Decouple the About fragment from the FolderBrowserAdapter. Now it uses its own independent adapter (I have no idea why this wasn't done in the first place). 2013-08-29 12:40:35 -04:00
Lioncash 93ed4adb02 [Android] Use the same layout for the game list and the folder browser. Since the UI layouts are exactly the same. 2013-08-29 12:16:29 -04:00
Lioncash 64b83a18b2 [Android] Simplify the line divider for the folder browser and game list. Turns out someone disabled it in the list view initially. No more custom implementation now. 2013-08-29 12:06:31 -04:00
Ryan Houdek 8ae076e665 Merge branch 'iconv_static' 2013-08-29 05:54:02 -05:00
Ryan Houdek 18fd690533 Only use static iconv on Android. 2013-08-29 05:53:15 -05:00
Ryan Houdek cb8e7a1be5 Work around check_lib not finding iconv. 2013-08-29 05:40:16 -05:00
degasus c9afd83439 ogl: fix vertex stream detection
sorry, copy & paste fail
2013-08-29 12:01:34 +02: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
Lioncash c5a886100c [Android] Some minor formatting styling.
Remove unnecessary this statements.
2013-08-28 20:31:37 -04:00