Commit Graph

18901 Commits

Author SHA1 Message Date
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
flacs c8382cca83 Merge pull request #3167 from Tilka/wrapper
VertexLoaderUtils: remove simple wrapper functions
2015-10-12 00:41:25 +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
flacs ba20f114eb Merge pull request #3138 from ShadowsFriend/master
Fix OProfile discovery and drop bfd dependency
2015-10-11 16:43:51 +02: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
Markus Wick 7fe4ce03c9 Merge pull request #3159 from Tilka/aamodes
OGL: simplify AA modes initialization
2015-10-11 11:07:47 +02:00
Tillmann Karras 99228633c3 OGL: simplify AA modes initialization 2015-10-10 22:51:31 +02:00
flacs 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
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
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 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
Lioncash 66a576548c ConfigManager: Get rid of an unnecessary smart-pointer get() call 2015-10-08 19:36:28 -04:00
Scott Mansell 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
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
Matthew Parlane 400a737ef9 Merge pull request #3154 from lioncash/fallback
DSPEmitter: Rename Default() to FallBackToInterpreter()
2015-10-09 11:31:48 +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
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
Lioncash 1a74765146 Merge pull request #3146 from ShadowsFriend/nopch_fix
Include string.h in Hash.cpp if PCH is disabled
2015-10-06 09:09:30 -04: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
Matthew Parlane 6aa230c247 Merge pull request #3143 from sepalani/fixWSAGetLastError
WSAGetLastError: fix return value
2015-10-06 12:08:10 +13:00
Sepalani 8efd5d1a74 WSAGetLastError: fix return value 2015-10-06 00:15:20 +02:00
Scott Mansell 5d1f78da3b Merge pull request #3140 from RisingFog/patch-1
Fix wxWidgets Error in About Window
2015-10-06 06:55:10 +13:00
Chris Burgener 5edb2bfea1 Fix wxWidgets Error in About Window 2015-10-05 13:36:53 -04:00