Commit Graph

17805 Commits

Author SHA1 Message Date
flacs 9f15054358 Merge pull request #2487 from Tilka/vlj_pic
VertexLoaderX64: generate PIC
2015-06-03 21:43:50 +02:00
Markus Wick bcd77f9a3a Merge pull request #2482 from degasus/ogl_poke_z
OGL: Rewrite POKE_Z with a draw call
2015-06-03 20:35:34 +02:00
degasus eabda0efa5 Hotkeys: Implement default hotkeys
Also disable the default hotkeys of the old system.
2015-06-03 19:26:43 +02:00
degasus 501ebdb471 Hotkeys: Fix duplicated called hotkeys. 2015-06-03 19:26:43 +02:00
JosJuice 78b6ed0218 VolumeGC: Check that opening.bnr size matches type
The old code would accept files with BNR1 length and BNR2 type, which
can be a problem when GetNames tries to read the extra BNR2 strings.
2015-06-03 11:35:05 +02:00
comex 349f9d5493 Merge pull request #2484 from JosJuice/volume-return-types
Volume: Use more appropriate types for some returned values
2015-06-02 20:29:08 -04:00
comex 2ae6fb9240 Merge pull request #2338 from JosJuice/getfilelist-return
Filesystem: Return file list reference instead of modifying argument
2015-06-02 20:28:25 -04:00
Tillmann Karras 7a6a5e2791 VertexLoaderX64: generate PIC
Address static memory relative to a base register, analog to what we're
doing with PPCSTATE in the CPU JIT. This allows executable memory for
the vertex loader JIT to be allocated anywhere, not just within 2 GiB of
static data.

Fixes issue 8180.
2015-06-03 02:27:37 +02:00
comex 36b554613c Merge pull request #2494 from Sonicadvance1/common_disassembler
Break out the disassembler code from the WXWidgets UI.
2015-06-02 20:26:26 -04:00
comex f85db7a686 Merge pull request #2503 from sepalani/master
Fixed: NULL remoteHost in IOCTL_SO_INETATON
2015-06-02 20:23:39 -04:00
comex c0e567731a Merge pull request #2352 from JosJuice/scheduleevent-immediate-assert
CoreTiming: Add assert to ScheduleEvent_Immediate
2015-06-02 20:22:14 -04:00
comex 0c5aa54606 Merge pull request #2470 from degasus/syncgpu
Common: Blocking Loop (extracted from Fifo.cpp)
2015-06-02 20:19:00 -04:00
comex 3af30d12ed Fix subdialogs of the ISO props dialog... sort of
On OS X, if you close a subdialog of the ISO Properties dialog, such as
the one to add a new AR code, the main Dolphin window would magically
get raised above ISO Properties.  This is confusing, to say the least;
when I encountered this the other day, I thought the dialog was actually
getting closed.

I *think* the diagnosis looks like this:
Cocoa expects NSPanel (not to be confused with wxPanel) to be for things
like find dialogs, font dialogs with the little title bars, sheets, etc.
See:
https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
Therefore, NSPanels return NO for canBecomeMainWindow, which is
documented; and when [NSWindow orderOut:] is called to hide a window,
Cocoa seems to want to make the window it focuses in its place a main
window, which, as far as I can tell, is not.  So if the next highest
window is a panel, it gets skipped over.  (I tested this by overriding
wxNSPanel's canBecomeMainWindow to return YES, in which case the right
window gets focused, but this isn't a correct fix.)

The ISO Properties dialog does have grounds to be a dialog/panel - the
close button, whose positioning is provided by the wxDialog class.  This
is arguably simply a roundabout discovery that our UI sucks for an OS X
app and that to be consistent with other nonmodal preferences dialogs,
it shouldn't have such a button on OS X (though ESC to close is still
kosher).  However, I'm not willing to make that change right now, so...

Hack around the problem by calling Raise (on this) after each call to
ShowModal in CISOProperties.  The resulting behavior is slightly
glitchy, and I'd like to revisit it, but for now it fixes the issue.
2015-06-02 20:15:12 -04:00
flacs 00cbc7c7c7 Merge pull request #2508 from comex/fix-gecko-codes
Fix bug where Gecko codes would be "enabled by default"
2015-06-03 01:13:43 +02:00
comex 35ca27f1cd Fix bug where Gecko codes would be "enabled by default"
Actually caused by IniFiles::GetLines leaving the output vector in its
old state if the section wasn't found, and Gecko::LoadCodes not checking
the return value.  Fix by moving lines->clear() up.
2015-06-02 19:04:04 -04:00
flacs 64ccea4e05 Merge pull request #2507 from comex/asdfasdfasdfasdf
fix duplicate variable definition
2015-06-03 01:00:24 +02:00
comex 97d6b71f3f fix duplicate variable definition 2015-06-02 18:49:53 -04:00
comex eb234da67f Disable shared libenet by default because I'm going to diverge it soon.
The changes I intend to make are:
- supporting IPv6 by rebasing on https://github.com/freeminer/enet
- adding custom code for quick resending

Even if I manage to get the latter upstream (which I'd like to wait for
some testing before attempting), I don't know what the original author
might do with the former, so...

Leave an option to use it for the sake of Linux distros - this means any
changes must stay protocol compatible, and Dolphin must work around any
API incompatibilities (e.g. for IPv6).
2015-06-02 18:42:50 -04:00
comex d31d2b1949 Add check for enet_socket_get_address in shared enet. 2015-06-02 18:42:50 -04:00
comex 599e42c562 Work around check_libs failing on OS X due to -x objective-c. 2015-06-02 18:42:48 -04:00
comex fd855758cc Explicitly specify .pc names, since the previous guess in CheckLib.cmake wasn't always right.
This fixes detection of at least libenet via pkg-config, and I think
libpng via pkg-config pulseaudio via direct detection.

Also remove the NOT APPLE from the shared libenet check, because there's
no reason for it.
2015-06-02 18:42:45 -04:00
comex 3243a21573 Update enet to latest master - 5f476546edabdf37509cd3448d1a616f5eca535d
Command I used, for posterity:

for fn in $(cd /usr/src/enet; echo **/*); do if [ -e $fn ]; then cp -a \
/usr/src/enet/$fn $fn; fi; done
2015-06-02 18:42:45 -04:00
comex a3b3f0522b Merge pull request #1556 from comex/project-moration
Rudimentary version of Wii IPC determinism.  Ported from my old udpnet branch.
2015-06-02 18:38:19 -04:00
degasus 84b13de538 OGL: Rewrite POKE_Z with a draw call
It's now also merged and it should be faster than the glClear way.
2015-06-02 23:06:41 +02:00
Sepalani f494d1f224 Removed: Unnecessary ternaries in IOCTL_SO_INETATON 2015-06-02 22:24:29 +02:00
Sepalani 058d279ca4 Merge remote-tracking branch 'upstream/master' 2015-06-02 21:34:22 +02:00
Sepalani b95f18fc06 Fix a possible null pointer dereference 2015-06-02 21:09:03 +02:00
flacs 2b5945ae07 Merge pull request #2491 from TijmenW/master
add shaders for anaglyph Amber-Blue and Green-Magenta
2015-06-02 20:55:30 +02:00
Tijmen Wildervanck 0fdd3ecdfe add shaders for anaglyph Amber-Blue and Green-Magenta 2015-06-02 20:47:56 +02:00
Sepalani 6985fd76b2 Merge remote-tracking branch 'upstream/master' 2015-06-02 20:24:54 +02:00
Sepalani 2ff5c451d0 Cleanup IOCTL_SO_INETATON 2015-06-02 20:15:05 +02:00
Tillmann Karras 794a311b11 Jit64: add FMA4 support to fmaddXX 2015-06-02 19:19:52 +02:00
Tillmann Karras 8db6588bb9 XEmitter: add FMA4 instructions 2015-06-02 19:19:52 +02:00
flacs 7d29039c48 Merge pull request #2498 from Tilka/wiimote_nogui
MainNoGUI: support real Wiimotes
2015-06-02 19:04:50 +02:00
Ryan Houdek 17e1f644b0 Merge pull request #2504 from ds84182/master
Fix invalid enums on OpenGLES
2015-06-02 12:17:12 -04:00
Dwayne Slater ebf3048494 Fix invalid enums on OpenGLES 2015-06-02 12:13:31 -04:00
Ryan Houdek 9407797d16 Merge pull request #2454 from Sonicadvance1/armv7_disable_loadstores
[ARMv7] Extend the life of the JIT Recompiler.
2015-06-02 10:42:06 -04:00
Sepalani 893ef20840 Fixed: NULL remotehost in IOCTL_SO_INETATON 2015-06-02 13:51:19 +02:00
flacs 0463f61499 Merge pull request #2502 from Tilka/xmm_swap
Jit64: swap XMM registers for later optimization
2015-06-02 13:06:08 +02:00
Tillmann Karras d516e6bbf0 Jit64: swap XMM registers for later optimization
(BLENDVPD uses XMM0 as an implicit mask.)
2015-06-02 12:47:07 +02:00
flacs 426f33c408 Merge pull request #2500 from Tilka/osx_wiimotes
WiimoteReal: fix multiple Wiimotes on OS X
2015-06-02 05:03:15 +02:00
Tillmann Karras b96f0fad57 WiimoteReal: fix multiple Wiimotes on OS X 2015-06-02 00:31:02 +02:00
flacs d36df5b1b4 Merge pull request #2468 from JosJuice/honor-logging-startup
Honor logging settings at startup
2015-06-01 23:56:15 +02:00
Ryan Houdek 1414221bd4 Merge pull request #2499 from sigmabeta/android-tv-tweaks
Android TV: Make file selector screen usable with d-pads
2015-06-01 16:58:15 -04:00
Eder Bastos ed39876cb0 Android TV: Make file selector screen usable with d-pads 2015-06-01 16:42:54 -04:00
Ryan Houdek 1d90a1b8a7 Merge pull request #2497 from Sonicadvance1/aarch64_minor_opt
[AArch64] Minor bugfix and optimization.
2015-06-01 16:40:26 -04:00
aerisarn f403bb09b0 MainNoGUI: support real Wiimotes
This should be restructured to move the connection logic into Core
instead of duplicating it in every Host, but alas, I'm too lazy for
that right now. ~flacs
2015-06-01 14:59:22 +02:00
Lioncash 2cb073291c Merge pull request #2490 from endrift/fix-tas-threading
DolphinWX: Fix threading issues with TAS pad updates
2015-05-31 23:24:40 -04:00
Ryan Houdek 5ed3a5de22 [AArch64] Minor bugfix and optimization.
Fixes a bug in lfs where I was doing a rev64.16b when I needed to do a rev32.8b.
Change a ld1r.4s to a ld1r.2s.
Fix an issue where a fcvtl2 needed to be a fcvtl.
Re-enabled psq_l, issue with flickering can't be reproduced anymore, so whatever.
2015-05-31 22:03:36 -05:00
Ryan Houdek d0ae3f7d24 Break out the disassembler code from the WXWidgets UI.
This cleans up some of the code between core and UI for disassembling and dumping code blocks.
Should help the QT UI in bringing up its debug UI since it won't have to deal with this garbage now.
2015-05-31 18:16:59 -05:00