mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 08:51:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,981 Commits 6 Branches 12 Tags 98 GiB
61c8ce2711
Commit Graph

16613 Commits

Author SHA1 Message Date
flacs
05e339a605 Merge pull request #3139 from JosJuice/fix-wii-root 
Mark which Wii root to use in the NAND path code
 2015-10-16 16:49:34 +02:00
Markus Wick
d12b026ecb Merge pull request #3165 from mimimi085181/partial-texture-updates-same-offset 
Do not try to load strided efb copies or ones with wrong dimensions
 2015-10-16 10:02:36 +02:00
comex
c22d1d68ab Mark which Wii root to use in the NAND path code. 
It's used by both the GUI to do things like install WADs and check up on
the system menu, in which case the global root should be used, and by
/dev/es, in which case the local one should.  The latter isn't
*terribly* useful today, since no contents will ever be installed in
temporary roots (although it's still relevant for data directories), but
converting the whole thing makes sense because then it will Just Work
once the entire NAND is synced.

Because it would have been a bit of work to split it up (but I can if
desired), this commit also contains some basic cleanup of
NANDContentLoader:

(1) The useless interface class INANDContentLoader is removed and the
    methods are changed to just return CNANDContentLoader (the only
    implementation);
(2) CNANDContentManager is changed to use unique_ptr and cleaned up a
    bit.
 2015-10-16 09:10:39 +02:00
flacs
0d0704453e Merge pull request #3070 from lioncash/vert 
VertexShaderManager: Get rid of float pointer casts.
 2015-10-16 05:48:27 +02:00
flacs
e57f1796b5 Merge pull request #3114 from lioncash/ui 
ControllerConfigDiag: Amend button sizing issues on hi-DPI displays
 2015-10-16 05:48:07 +02:00
Lioncash
419fed3952 VertexShaderManager: Get rid of other magic constants 2015-10-15 23:41:42 -04:00
Lioncash
b5b304cff2 VertexShaderManager: Get rid of float pointer casts 2015-10-15 23:34:54 -04:00
Lioncash
03986c6fad UCodes: Simplify ExramRead 2015-10-15 22:48:22 -04:00
Lioncash
c420c52308 UCodes: Get rid of pointer casts 2015-10-15 22:45:03 -04:00
mimimi085181
af28934703 Do not delete strided efb copies on load 
This hopefully allows to use partial texture updates with strided efb copies that start at the same offset as the loaded texture
 2015-10-15 00:45:55 +02:00
degasus
b69bff0690 VideoSW: Use OpenGL Core context 2015-10-14 00:13:54 +02:00
degasus
61c3a0d9e4 VideoSW: Split up OGL window handling 
This removes OSD support for video software, but it was already broken before.

This commit does not try to fix coding style issues, the rewrite of this presentation API is splitted up.
 2015-10-14 00:13:54 +02:00
flacs
b0bbe52cc9 Merge pull request #3164 from phire/samplerArrays 
PixelShaderGen: Use arrays of texture samplers.
 2015-10-12 18:44:14 +02:00
flacs
97fbbecdc4 Merge pull request #3168 from Tilka/miniupnpc 
CMake: simplify FindMiniupnpc.cmake
 2015-10-12 14:32:57 +02:00
flacs
4c3dc0c1ae Merge pull request #3047 from Tilka/decompress_for_md5 
DolphinWX: decompress discs to calculate MD5 hash
 2015-10-12 05:21:34 +02:00
flacs
4467c762d7 Merge pull request #3166 from Tilka/wiimote_state 
Wiimote: simplify DoState() parameters
 2015-10-12 05:21:21 +02:00
Tillmann Karras
00aefa5e08 DolphinWX: decompress discs to calculate MD5 hash 2015-10-12 02:35:43 +02:00
Tillmann Karras
efe71e686b DiscIO: implement CISOBlob::GetDataSize() 
This is a best-effort approach, since the CISO format does not save the
original file size.
 2015-10-12 02:33:38 +02:00
Tillmann Karras
1a8e2e16e3 DiscIO: implement WbfsBlob::GetDataSize() 2015-10-12 02:33:04 +02:00
Tillmann Karras
a92b4bda95 DiscIO: fix reading the last sector in WBFS 
Instead of rounding down, round up.
 2015-10-12 02:31:51 +02:00
Tillmann Karras
3a2efc9f4f DiscIO: merge initial WBFS reads 2015-10-12 02:31:51 +02:00
Tillmann Karras
f416106eec DiscIO: pre-swap WLBA 2015-10-12 02:31:51 +02:00
Tillmann Karras
b1100e4aa0 DiscIO: use std::min() in WBFS 2015-10-12 02:31:51 +02:00
Tillmann Karras
4eace2b49e CMake: simplify FindMiniupnpc.cmake 
miniupnpc.h provides MINIUPNPC_API_VERSION since 1.7 and we require 1.7
or later, so there is no reason to have version detection code for older
versions.
 2015-10-12 02:26:35 +02:00
Tillmann Karras
9f8981c7c0 VertexLoaderUtils: remove simple wrapper functions 2015-10-11 23:40:50 +02:00
Tillmann Karras
ae999cb43c Wiimote: simplify DoState() parameters 2015-10-11 23:37:34 +02:00
Scott Mansell
645e4cbbee PixelShaderGen: Use arrays of texture samplers. 2015-10-12 05:06:39 +13:00
Christian Widmer
b99d1a0a20 Fix OProfile discovery and drop bfd dependency 
Adds a cmake module to correctly discover OProfile and adjusts the
corresponding CMakeLists to make use of it. Additionally removes
linking against the bfd library when compiling with OProfile because
Dolphin does not use it.
 2015-10-11 16:27:03 +02:00
flacs
c4fe2cd287 Merge pull request #3147 from ShadowsFriend/qtinstall_fix 
DolphinQt: Install binary for systems not matching APPLE
 2015-10-11 15:54:02 +02:00
flacs
94d20131bb Merge pull request #3151 from ShadowsFriend/memtools_unistd 
Include unistd.h in memtools.cpp to fix nopch
 2015-10-11 15:52:40 +02:00
flacs
e389a3cafe Merge pull request #3131 from delroth/fifo-pad 
FifoDataFile: Revert PadFile changes from 4.0-1127.
 2015-10-11 15:50:24 +02:00
flacs
a7b6ae8f2c Merge pull request #3160 from Tilka/style 
Misc. style fixes
 2015-10-11 15:36:06 +02:00
flacs
f3c88137e7 Merge pull request #2798 from lioncash/search 
Debugger: Use wxSearchCtrls instead of wxTextCtrl for address searching.
 2015-10-11 15:29:59 +02:00
flacs
fe164e3a90 Merge pull request #3137 from lioncash/namespace 
StreamADPCM: Convert into a namespace
 2015-10-11 15:27:45 +02:00
flacs
a9d6448777 Merge pull request #3150 from lioncash/iter 
NANDContentLoader: Replace a string rbegin() call with a back() call
 2015-10-11 15:26:51 +02:00
Tillmann Karras
99228633c3 OGL: simplify AA modes initialization 2015-10-10 22:51:31 +02:00
Tillmann Karras
0f1b287402 Misc. style fixes 2015-10-10 17:44:42 +02:00
Tillmann Karras
19a490a82d Linux: detect perf and default map dir to /tmp 
This obviously only works when Dolphin is run by perf rather than being
started separately.
 2015-10-10 16:42:53 +02:00
degasus
d4e447555e VideoSW: Wipe alpha on bypass EFB 
Alpha must not be displayed.
 2015-10-10 11:45:39 +02:00
Christian Widmer
1dd4c93f0c DolphinQt: Install binary for systems not matching APPLE 2015-10-09 11:11:41 +02:00
Christian Widmer
6eb6fa9bf8 Include unistd.h in memtools.cpp to fix nopch 
Fixes falling back to generic on non-windows builds with PCH disabled
leading to runtime crashes and the pagefault test failing. Thanks to
HdkR!
 2015-10-09 11:08:17 +02:00
Lioncash
737de5e115 StreamADPCM: Convert into a namespace 
No need to have a class with only static member functions
 2015-10-08 19:46:55 -04:00
Lioncash
66a576548c ConfigManager: Get rid of an unnecessary smart-pointer get() call 2015-10-08 19:36:28 -04:00
Scott Mansell
71d7cd6b9d DolphinWX: Make UpdateLog() return in a finite time. 
After fixing the deadlock in #3006, it is now possible for log
messages to flood in faster than UpdateLog can render them.

This causes it to never return, locking up the gui thread and
filling the windows message queue (which triggers the stack
overflow bug in older versions of Wx)
 2015-10-09 12:14:04 +13:00
Lioncash
307ef88af6 DSPEmitter: Rename Default() to FallBackToInterpreter() 2015-10-08 12:45:14 -04:00
Lioncash
5f181957b3 NANDContentLoader: Replace a string rbegin() call with a back() call 2015-10-07 09:47:26 -04:00
catzilla4
867a1beb9f Added some headers to allow Dolphin to compile in my environment. 2015-10-06 19:09:57 -05:00
shuffle2
ec28d7df92 Merge pull request #3144 from lioncash/dsp 
DSPIntCCUtil: Minor changes
 2015-10-06 13:03:11 -07:00
shuffle2
1c97da4942 Merge pull request #3132 from sepalani/fix_mbedtls 
mbedTLS: fix blocking read
 2015-10-06 13:01:57 -07:00
Christian Widmer
1fc1f00162 Include cstring in Hash.cpp to fix building without PCH 2015-10-06 14:59:56 +02:00
Lioncash
f53d060d70 DSPIntCCUtil: Remove unused function GetMultiplyModifier 2015-10-05 19:40:11 -04:00
Lioncash
1a989985c1 DSPIntCCUtil: Mark translation local functions as static 2015-10-05 19:39:09 -04:00
Sepalani
8efd5d1a74 WSAGetLastError: fix return value 2015-10-06 00:15:20 +02:00
Chris Burgener
5edb2bfea1 Fix wxWidgets Error in About Window 2015-10-05 13:36:53 -04:00
shuffle2
3b1375f78c Merge pull request #3134 from lioncash/namespace 
CPU: Convert CCPU into a namespace
 2015-10-04 14:22:50 -07:00
shuffle2
55ea9e77e6 Merge pull request #3135 from lioncash/dsp 
DSPCore: Convert defines over to enums
 2015-10-04 14:22:02 -07:00
shuffle2
552c1f51d8 Merge pull request #3068 from mickdermack/pr-block-input 
Block WX input when detecting controls
 2015-10-04 14:19:44 -07:00
Lioncash
b730ad4406 DSPCore: Convert defines over to enums 2015-10-04 16:42:30 -04:00
Lioncash
ef1cc2cec4 CPU: Convert CCPU into a namespace 
There's not much point to a class with only static member functions.
 2015-10-04 15:15:10 -04:00
Lioncash
ba0a3c520b EXI_DeviceAGP: Remove unnecessary headers 2015-10-04 13:13:32 -04:00
Fog
471c835546 Add Frame Advance Hold Hotkey Functionality 2015-10-04 12:14:36 -04:00
Michael Ehrenreich
b4411bd2ef Block WX input when detecting controls 2015-10-04 14:50:28 +02:00
Pierre Bourdon
a2b3cdc393 FifoDataFile: Revert PadFile changes from 4.0-1127. 
Fixes #9006.
 2015-10-04 13:53:01 +02:00
Sepalani
5be64d39b0 mbedTLS: fix blocking read 2015-10-04 12:24:25 +02:00
shuffle2
6d4128ddcc Merge pull request #3128 from lioncash/unique 
ControllerEmu: Use make_unique over raw new
 2015-10-03 19:08:00 -07:00
shuffle2
569d25d9b4 Merge pull request #3129 from lioncash/mailbox 
DSPHWInterface: Use an enum for indicating mailbox type
 2015-10-03 19:04:35 -07:00
shuffle2
eb07038723 Merge pull request #3130 from rohit-n/sign-compare 
VideoCommon: Silence -Wsign-compare warnings.
 2015-10-03 18:49:38 -07:00
Rohit Nirmal
18f0831861 VideoCommon: Silence -Wsign-compare warnings. 2015-10-03 20:32:16 -05:00
shuffle2
0fdaacc7e0 Merge pull request #2738 from lioncash/bitfield 
Common: Fix BitField mask generation.
 2015-10-03 18:21:24 -07:00
shuffle2
81414b4fa2 Merge pull request #3076 from void-ghost/stereo3d_presets 
Stereo3d presets
 2015-10-03 18:10:23 -07:00
shuffle2
b926061f64 Merge pull request #3095 from void-ghost/savestate_race_condition_fix 
SaveState: Fix for race condition in SaveAs(...)
 2015-10-03 18:08:33 -07:00
shuffle2
4fb90bf9f6 Merge pull request #3115 from lioncash/ifx 
DSPCore: Minor changes
 2015-10-03 18:03:26 -07:00
shuffle2
06379cc3a0 Merge pull request #3113 from lioncash/input 
InputCommon: Get rid of multiple identical define macros
 2015-10-03 18:01:36 -07:00
shuffle2
a6f04b0e15 Merge pull request #3091 from Tilka/mbedtls 
Update mbed TLS (PolarSSL)
 2015-10-03 18:00:58 -07:00
shuffle2
8bb35c8588 Merge pull request #3083 from JosJuice/ipc-ticks 
Use correct GetTicksPerSecond() value in IPC delays
 2015-10-03 17:56:57 -07:00
shuffle2
9878004871 Merge pull request #3105 from phire/dont_block 
ALSA: Don't block on Clear() call.
 2015-10-03 17:55:26 -07:00
shuffle2
f5c88fc1a9 Merge pull request #3125 from JosJuice/di-callback-pointer 
Simplify getting DI pointer in IOCtl callback
 2015-10-03 17:52:58 -07:00
shuffle2
b4be34bc68 Merge pull request #3124 from dolphin-emu/shuffle2-patch-1 
Fix WiiSockMan::DecodeError
 2015-10-03 14:59:20 -07:00
Lioncash
9c73d63d40 DSPHWInterface: Use an enum for indicating mailbox type 2015-10-03 17:53:24 -04:00
Lioncash
fa05710f2f ControllerEmu: Use make_unique over raw new 2015-10-03 15:37:25 -04:00
Lioncash
5464e698fc Merge pull request #3102 from rohit-n/build-pch 
Fix building with PCH disabled.
 2015-10-03 13:30:51 -04:00
JosJuice
bf2676a1b1 Simplify getting DI pointer in IOCtl callback 
Gets rid of an odd code construct, and fixes the "Trying to run two DI
devices at once" ERROR_LOG appearing at the wrong times.
 2015-10-03 11:35:29 +02:00
shuffle2
f33fae574f Fix WiiSockMan::DecodeError 2015-10-03 01:56:42 -07:00
Scott Mansell
a10a3ecbac ALSA: Don't block on Clear() call. 
snd_pcm_writei() is meant to block block until all samples are written,
but apparently in some situations it can block for much longer, prehaps
even a infinite time, in the case of virtual machine FifoCI runs in.

Because it grabed a mutex before blocking, it could also block the
Clear() call for an infinite length of time, blocking dolphin's emu
thread.

snd_pcm_writei() also takes 10-15 seconds if you run dolphin under GDB
and can randomly take 5 or so seconds during normal usage.

By moving all the pause code to the ALSA thread, Clear() no-longer
blocks and everyone keeps their sanity.
 2015-10-03 16:31:55 +13:00
flacs
6658d21215 Merge pull request #3121 from lioncash/pch 
pch: Update MSVC version check
 2015-10-03 05:21:17 +02:00
Scott Mansell
f1a43dc6d4 Merge pull request #3118 from lioncash/junk 
WiimoteEmu: Get rid of an unused clamp function
 2015-10-03 16:21:00 +13:00
Scott Mansell
bcee41b65d Merge pull request #3123 from lioncash/null 
Core: Replace 0 literals with nullptr
 2015-10-03 16:19:46 +13:00
Rohit Nirmal
6001366aac Alsa: Silence -Wsign-compare warning. 2015-10-02 21:10:06 -05:00
Lioncash
0f6c4653a4 Core: Replace 0 literals with nullptr 2015-10-02 22:06:17 -04:00
Lioncash
aeee5be5ef pch: Update MSVC version check 2015-10-02 20:51:23 -04:00
Lioncash
a30681834c InputCommon: Use NSNumber numeric literals in Obj-C code 2015-10-02 13:23:46 -04:00
Lioncash
5d8e422d82 WiimoteEmu: Get rid of an unused clamp function 2015-10-02 10:33:29 -04:00
Lioncash
75907d83c6 DSPCore: Get rid of division for determining array size in VerifyRoms 2015-10-01 11:49:30 -04:00
Lioncash
73f312863d DSPCore: Compress common fill loops into std::fill 2015-10-01 11:23:01 -04:00
Scott Mansell
58d893e56f Merge pull request #3075 from waddlesplash/no-regexp 
FileSearch: Don't use RegExes, just do string comparisons.
 2015-10-02 04:00:23 +13:00
Lioncash
ccc3cd884e DSPCore: Use std::array to represent ifx_regs 2015-10-01 10:26:16 -04:00
Lioncash
7f9cb1b6a8 ControllerConfigDiag: Remove superfluous arguments 2015-10-01 09:37:48 -04:00
Lioncash
b3da7e81bd ControllerConfigDiag: Amend button sizing issues 2015-10-01 09:34:32 -04:00
Lioncash
449c57a8e0 InputCommon: Get rid of multiple identical define macros 2015-10-01 08:45:22 -04:00
flacs
696d6eae09 Merge pull request #3108 from lioncash/cstyle-array 
ChunkFile: Provide additional helpers for C-style arrays
 2015-10-01 01:55:54 +02:00