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
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
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
93299e2dd0
Merge pull request #3169 from endrift/update-miniupnpc
...
Externals: Update miniupnpc to API version 14
2015-10-16 06:09:30 +02:00
0d0704453e
Merge pull request #3070 from lioncash/vert
...
VertexShaderManager: Get rid of float pointer casts.
2015-10-16 05:48:27 +02:00
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
419fed3952
VertexShaderManager: Get rid of other magic constants
2015-10-15 23:41:42 -04:00
b5b304cff2
VertexShaderManager: Get rid of float pointer casts
2015-10-15 23:34:54 -04:00
28cb62dc7f
Merge pull request #3171 from lioncash/ucode
...
UCodes: Minor cleanup
2015-10-16 05:03:12 +02:00
03986c6fad
UCodes: Simplify ExramRead
2015-10-15 22:48:22 -04:00
c420c52308
UCodes: Get rid of pointer casts
2015-10-15 22:45:03 -04:00
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
efb7272396
Externals: Update miniupnpc to API version 14
2015-10-13 23:35:52 -07:00
b0bbe52cc9
Merge pull request #3164 from phire/samplerArrays
...
PixelShaderGen: Use arrays of texture samplers.
2015-10-12 18:44:14 +02:00
97fbbecdc4
Merge pull request #3168 from Tilka/miniupnpc
...
CMake: simplify FindMiniupnpc.cmake
2015-10-12 14:32:57 +02:00
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
4467c762d7
Merge pull request #3166 from Tilka/wiimote_state
...
Wiimote: simplify DoState() parameters
2015-10-12 05:21:21 +02:00
00aefa5e08
DolphinWX: decompress discs to calculate MD5 hash
2015-10-12 02:35:43 +02:00
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
1a8e2e16e3
DiscIO: implement WbfsBlob::GetDataSize()
2015-10-12 02:33:04 +02:00
a92b4bda95
DiscIO: fix reading the last sector in WBFS
...
Instead of rounding down, round up.
2015-10-12 02:31:51 +02:00
3a2efc9f4f
DiscIO: merge initial WBFS reads
2015-10-12 02:31:51 +02:00
f416106eec
DiscIO: pre-swap WLBA
2015-10-12 02:31:51 +02:00
b1100e4aa0
DiscIO: use std::min() in WBFS
2015-10-12 02:31:51 +02:00
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
c8382cca83
Merge pull request #3167 from Tilka/wrapper
...
VertexLoaderUtils: remove simple wrapper functions
2015-10-12 00:41:25 +02:00
9f8981c7c0
VertexLoaderUtils: remove simple wrapper functions
2015-10-11 23:40:50 +02:00
ae999cb43c
Wiimote: simplify DoState() parameters
2015-10-11 23:37:34 +02:00
645e4cbbee
PixelShaderGen: Use arrays of texture samplers.
2015-10-12 05:06:39 +13:00
ba20f114eb
Merge pull request #3138 from ShadowsFriend/master
...
Fix OProfile discovery and drop bfd dependency
2015-10-11 16:43:51 +02:00
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
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
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
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
a7b6ae8f2c
Merge pull request #3160 from Tilka/style
...
Misc. style fixes
2015-10-11 15:36:06 +02:00
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
fe164e3a90
Merge pull request #3137 from lioncash/namespace
...
StreamADPCM: Convert into a namespace
2015-10-11 15:27:45 +02:00
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
7fe4ce03c9
Merge pull request #3159 from Tilka/aamodes
...
OGL: simplify AA modes initialization
2015-10-11 11:07:47 +02:00
99228633c3
OGL: simplify AA modes initialization
2015-10-10 22:51:31 +02:00
df20326d45
Merge pull request #3158 from Tilka/perf
...
Linux: detect perf and default map directory to /tmp
2015-10-10 21:59:03 +02:00
0f1b287402
Misc. style fixes
2015-10-10 17:44:42 +02:00
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
1dd4c93f0c
DolphinQt: Install binary for systems not matching APPLE
2015-10-09 11:11:41 +02:00
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
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
e955a3a191
Merge pull request #3141 from lioncash/get
...
ConfigManager: Get rid of an unnecessary smart-pointer get() call
2015-10-08 19:46:01 -04:00
66a576548c
ConfigManager: Get rid of an unnecessary smart-pointer get() call
2015-10-08 19:36:28 -04:00
dd5df05c01
Merge pull request #3148 from phire/logWindow_lockup
...
DolphinWX: Make UpdateLog() return in a finite time (aka, fix stack overflow messages when logging is enabled)
2015-10-09 12:18:34 +13:00
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
flacs