Commit Graph
100 Commits
Author SHA1 Message Date
Scott Mansell ce6de78854 Merge pull request #3250 from JosJuice/loadgameini-condition
BootManager: Remove unnecessary LoadGameIni condition
2015-12-22 13:24:09 +13:00
Scott Mansell a691e1fb6d Merge pull request #2621 from AdmiralCurtiss/config-cache-methods
BootManager: Slightly clean up the config_cache.
2015-12-22 12:52:16 +13:00
Scott Mansell 1ce9c33f6c Merge pull request #3373 from JosJuice/temp-settings-ini-hotfix
Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.
2015-12-22 12:37:22 +13:00
Scott Mansell ebe3c49c5f Merge pull request #3332 from degasus/master
MSAA: Store samples in ini files.
2015-12-19 01:37:10 +13:00
Scott Mansell 48760c9037 Merge pull request #3323 from Simek/minor-config-gui-tweaks
minor General Config GUI improvements
2015-12-08 14:37:30 +13:00
Scott Mansell a759883ae5 Merge pull request #3126 from phire/remove-logging-lock
Refactor logging code to get rid of a mutex.
2015-12-03 13:32:07 +13:00
Scott Mansell 03461915a7 Fix lens flares in Mario Kart Wii. 2015-12-01 05:25:38 +13:00
Scott Mansell 97231aa221 Merge pull request #3294 from spxtr/DQt2-GameProxyModel
DolphinQt2: Use a proxy model for the GameList
2015-11-30 07:48:54 +13:00
Scott Mansell 97cd723492 Merge pull request #3286 from jloehr/Wiimote-Rumble-LED-Fix
Fix Prepare (Set LEDs and Rumble) on Connect and Refresh
2015-11-29 00:58:18 +13:00
Scott Mansell 861bd98e3a Merge pull request #3291 from JosJuice/memset-error-check
Memmap: More error checking for Memset
2015-11-28 22:38:24 +13:00
Scott Mansell 4b4b753cc4 Merge pull request #3293 from JosJuice/volumedirectory-plainfilereader
DiscIO: Don't use PlainFileReader in VolumeDirectory
2015-11-28 22:32:12 +13:00
Scott Mansell 5a1729877e Merge pull request #3211 from JosJuice/themes-to-resources
Move nobanner and fileplatform from Themes to Resources
2015-11-27 23:47:44 +13:00
Scott Mansell df4c1d680e Merge pull request #3264 from JosJuice/simplify-iselfordol
ISOFile/GameFile: Simplify IsElfOrDol
2015-11-27 23:10:45 +13:00
Scott Mansell f33a9ed439 Merge pull request #3261 from spxtr/DolphinQt
DolphinQt Rewrite
2015-11-27 22:06:31 +13:00
Scott Mansell e1fe2db7d9 Merge pull request #3289 from waddlesplash/dolphin-qt-fixup
DolphinQt: Get rid of unneeded abbreviation macros.
2015-11-27 09:56:51 +13:00
Scott Mansell 211169e307 Merge pull request #3269 from JosJuice/purge-cache
Rename "Purge Cache" to "Purge Game List Cache"
2015-11-24 14:17:49 +13:00
Scott Mansell 83bda3be46 Merge pull request #1474 from phire/DSPHLE_cleanups
DSPHLE: Remove individual byteswaps and replace with generic function.
2015-11-24 13:33:59 +13:00
Scott Mansell ffb9722f2d Merge pull request #3032 from waddlesplash/dolphin-qt
Lots more minor DolphinQt stuffs.
2015-11-23 21:45:28 +13:00
Scott Mansell 6082af7790 Merge pull request #3273 from Sonicadvance1/enable_page_fault_test
Enable the page fault test on targets that aren't x86_64
2015-11-20 01:11:48 +13:00
Scott Mansell 2ca07f3485 Merge pull request #3272 from Sonicadvance1/we_love_traps
Use __builtin_trap for our crash define instead of int3/exit
2015-11-20 01:11:29 +13:00
Scott Mansell d2b03e1aad Remove individual byteswaps and replace with generic function. 2015-11-17 19:37:18 +13:00
Scott Mansell eddea7f15f Merge pull request #3181 from JosJuice/scrub-directories
Don't reserve space for directories when scrubbing
2015-11-17 10:37:09 +13:00
Scott Mansell cea8c5bd56 Merge pull request #3262 from JosJuice/return-blobtype
DolphinQt: Fix typo of return m_blob_type;
2015-11-16 08:35:51 +13:00
Scott Mansell 18afbe6490 Merge pull request #3210 from degasus/efbcopy
TextureCache: Efb Copy Separation
2015-11-16 00:13:42 +13:00
Scott Mansell 19e3fba59f Merge pull request #3255 from mickdermack/pr-hidrace
Fix a race condition on shutdown between Memory and CWII_IPC_HLE_Device_hid
2015-11-13 23:54:33 +13:00
Scott Mansell d6b2fcaa71 Merge pull request #3242 from phire/less-warnings
XFMem: Don't warn on writes of zero to unknown registers.
2015-11-10 00:20:02 +13:00
Scott Mansell 8b3c2c1ba7 Merge pull request #3241 from phire/nogui-assert
NoGui: Return no to yes/no panic alerts.
2015-11-08 21:51:21 +13:00
Scott Mansell 636bedb207 XFMem: Don't warn on writes of zero to unknown registers. 2015-11-08 14:59:55 +13:00
Scott Mansell 2d38a59044 NoGui: Return no to yes/no panic alerts.
Also, print to stderr instead of stdio.
2015-11-08 14:10:26 +13:00
Scott Mansell 973118511a Merge pull request #2742 from AdmiralCurtiss/display-savestate-stats
Display Savestate information in Overlay and Menu.
2015-11-08 02:20:56 +13:00
Scott Mansell bdbe8e3691 Merge pull request #3238 from phire/fifo_version_number_fixes
Fifoplayer: Load the Correct version number.
2015-11-08 01:50:26 +13:00
Scott Mansell e6274284b0 Fifoplayer: Load the Correct version number. 2015-11-08 01:24:08 +13:00
Scott Mansell 85144f5f77 Merge pull request #3233 from phire/remove-show-efb-copy-regions
[RFC] Remove the "Show EFB Copy Regions" debug option.
2015-11-05 21:04:34 +13:00
Scott Mansell 290466d57a Merge pull request #3231 from spxtr/Pipes
Fix some bugs in Pipe input parsing
2015-11-05 20:31:03 +13:00
Scott Mansell 51c984dde3 Remove the "Show EFB Copy Regions" debug option.
It was only implemented in OpenGL, though the option was visible in both
backends, leading to memory leaks if you enabled it in DirectX.

And it wasn't particularly useful as a debug feature as it only showed
where in the EFB the copies were taken from, not what format it was, or
what the copy was used for, or what content was in the EFB at that point
in time.

Also, it stretched the copy regions relative to the window, so the
on-screen regions don't even line up with the window unless the game used
the full EFB (some pal games) and you game image stretched to the full
window.
2015-11-05 18:15:46 +13:00
Scott Mansell fc48ff9791 Merge pull request #3225 from phire/moredebug
BPStructs: add debug info for texture setup.
2015-11-05 00:30:10 +13:00
Scott Mansell ba7b7522be BPStructs: add debug info for texture setup. 2015-11-05 00:13:25 +13:00
Scott Mansell 008386fc7f Just a minor cleanup. Totally not the cause of random FifoCi failures.
This 'absolutely not' a read of uninitialized memory is '100% not'
the cause of our non-deterministic behavior on the Intel NUC.

If there was a such an error, it would show up on all FifoCi
backends equally. This is 'probably' unrelated to the fact that
the Intel NUC is the only fifoci runner not running under virtualization.
2015-11-04 23:23:35 +13:00
Scott Mansell 05b06b7a21 Merge pull request #3227 from Tilka/sizeof
OGL: don't hardcode buffer sizes
2015-11-04 14:35:23 +13:00
Scott Mansell e161e714c7 Merge pull request #3226 from Tilka/shadergen
VideoCommon: return code/uid from shader gens
2015-11-04 13:42:49 +13:00
Scott Mansell 55c5ab5a21 Merge pull request #3220 from phire/ubuntu14.04
CMake: Fix FindMiniupnpc for ubuntu 14.04
2015-11-02 18:46:45 +13:00
Scott Mansell 4fa3ddcbf6 CMake: Fix FindMiniupnpc for ubuntu 14.04
Ubuntu 14.04 has miniupnpc 1.6.3
REGEX was failing because the string was empty, causing cmake to
error and not generate a Makefile.

This allows systems with older versions of miniupnpc to fall back
to the statically linked version in externals.
2015-11-02 18:00:06 +13:00
Scott Mansell 0245b1219b Correct capitalization of 'Visual Studio' 2015-11-02 17:12:09 +13:00
Scott Mansell 2ccd5a5928 Bitfield: Add BSD license to match BitField.h
Also, fix typo.
2015-11-01 18:01:51 +13:00
Scott Mansell f0e5232fe0 Bitfield: And then mess things up again by handling signed fields.
This is way more messy than it should be.
2015-10-30 14:05:14 +13:00
Scott Mansell 9125ab8304 BitField: Clean .natvis up slightly by using CDATA. 2015-10-30 14:04:40 +13:00
Scott Mansell bfac1c73f0 Bitfield: Add .natvis for easier debugging in Visual Studio 2015-10-30 12:30:22 +13:00
Scott Mansell 9154347f5b Merge pull request #3187 from lioncash/accum
FifoAnalyzer: Replace loop with std::accumulate
2015-10-29 10:30:38 +13:00
Scott Mansell 1984416df4 Merge pull request #3186 from lioncash/dsp
DSPJitRegCache: Minor changes
2015-10-29 10:29:26 +13:00
Scott Mansell 09b27e854c Merge pull request #3201 from Tilka/swizzle
VertexLoaderX64: optimize more color swizzles
2015-10-29 09:39:09 +13:00
Scott Mansell 44a40642f3 Merge pull request #2704 from RisingFog/frameadvancehold
Add Frame Advance Hold Hotkey Functionality
2015-10-28 15:31:03 +13:00
Scott Mansell bd20dd3962 Merge pull request #3188 from lioncash/texcache
TextureCacheBase: Change CacheLinesPerRow to BytesPerRow
2015-10-25 17:46:43 +13:00
Scott Mansell 4c5c33c514 VertexShader: Remove 'special case' that has been disabled forever. 2015-10-23 19:02:51 +13:00
Scott Mansell 5228758383 Merge pull request #3192 from lioncash/typedef
WII_IPC_HLE: Remove unused typedef
2015-10-22 21:09:41 +13:00
Scott Mansell 1ba600b688 Merge pull request #3145 from catzilla4/master
FreeBSD Compilation fix
2015-10-19 17:29:34 +13:00
Scott Mansell 2be909849b Merge pull request #3180 from phire/fix-gles
Make sure FORCE_EARLY_Z is defined for GLES
2015-10-18 14:58:22 +13:00
Scott Mansell 9ee610830c Make sure FORCE_EARLY_Z is defined for GLES 2015-10-18 02:37:14 +13:00
Scott Mansell 8b1138943d Merge pull request #3179 from phire/mesa-early-z
Support Conservative Depth as a fallback for Early Z (Mesa support for ZCompLoc)
2015-10-18 02:14:52 +13:00
Scott Mansell e7b2a22225 Support Conservative Depth as a fallback for EarlyZ
Allows Mesa based drivers to support ZCompLoc
2015-10-18 01:46:54 +13:00
Scott Mansell ac8976689b Merge pull request #3177 from Tilka/fix_warnings
PixelShaderGen: silence -Wformat-security warnings
2015-10-17 17:44:29 +13:00
Scott Mansell 645e4cbbee PixelShaderGen: Use arrays of texture samplers. 2015-10-12 05:06:39 +13: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
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
Scott Mansell f84577b90b LogManager: Move android logcat code into the proper place. 2015-10-04 02:18:06 +13:00
Scott Mansell 5f8a67250f Bitset: Make bool() operator explicit. 2015-10-04 01:37:32 +13:00
Scott Mansell 18142eddb4 LogManager: Remove unused define. 2015-10-04 00:38:47 +13:00
Scott Mansell 6153424b8c LogManager: replace set of LogListener pointers with bitset.
Mostly so we can iterate over which LogListeners are enabled without
having to aquire a lock.
2015-10-04 00:38:34 +13:00
Scott Mansell 83fa504cd9 Bitset: Make cast overrides const 2015-10-04 00:36:58 +13: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
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
Scott Mansell ce6f89fe6d Merge pull request #3122 from rohit-n/sign-compare
Alsa: Silence -Wsign-compare warning.
2015-10-03 16:17:11 +13:00
Scott Mansell fb35371e86 Merge pull request #3116 from Pringo/Readme-update
Update Readme.md
2015-10-02 23:29:21 +13: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
Scott Mansell ce493b897d Merge pull request #2271 from revel8n/fixes
Fix for alignment of zero-length files within directory based virtual disk
2015-09-28 05:28:38 +13:00
Scott Mansell be3851b72e Merge pull request #3090 from LPFaint99/gcifolder
GCI Folder: Skip 'header-only' writes
2015-09-28 05:26:12 +13:00
Scott Mansell af327aec79 Merge pull request #3036 from mimimi085181/hash-respecting-stride
Respect the stride for efb copies when hashing them
2015-09-28 05:23:55 +13:00
Scott Mansell 4817118028 Merge pull request #3084 from JosJuice/cpu-core-clock
SystemTimers: Don't name non-constant variables as if they are constant
2015-09-28 05:22:54 +13:00
Scott Mansell bf636a8fe5 Merge pull request #3094 from JosJuice/metroid-prime-ini
Don't force EFB Copies to Texture Only off for Metroid Prime
2015-09-28 05:20:18 +13:00
Scott Mansell a91810ba3b Merge pull request #3042 from booto/audio-timing
AI: reduce overhead of sample counter
2015-09-27 05:03:55 +13:00
Scott Mansell 6eb0c2552d Merge pull request #3085 from Tilka/fifoplayer
FifoPlayer: remove leftover code
2015-09-24 15:37:01 +12:00
Scott Mansell a537ca7543 Merge pull request #2997 from phire/FixFifoRecorder
FifoRecorder: Use Texture Cache to record efb copies correctly.
2015-09-23 00:17:37 +12:00
Scott Mansell aa1fec6fc3 FifoPlayer: Fixup style of types. 2015-09-23 00:03:43 +12:00
Scott Mansell a355d9868e FifoRecorder: Use Video Common to record efb2ram correctly.
Texture updates have been moved into TextureCache, while
TMEM updates where moved into bpmem. Code for handling
efb2ram updates was added to TextureCache.

There was a bug for preloaded RGBA8 textures, it only copied
half the texture. The TODO was wrong too.
2015-09-22 23:59:16 +12:00
Scott Mansell c9836ff592 EGL: Don't depend on VideoCommon or Core 2015-09-22 00:36:48 +12:00
Scott Mansell 72249b8085 GLX: Don't depend on Core or VideoCommon 2015-09-22 00:36:47 +12:00
Scott Mansell 01ed925fec AGL: Don't depend on VideoCommon 2015-09-22 00:36:46 +12:00
Scott Mansell 93f6563789 WGL: Don't depend on Core/VideoCommon 2015-09-22 00:36:45 +12:00
Scott Mansell 95f3c956a8 Move GL interface code out of the OpenGL video backend. 2015-09-22 00:36:45 +12:00
Scott Mansell b6cd78a370 VideoBackendBase: Remove check for XP. 2015-09-19 07:10:44 +12:00
Scott Mansell 3f56480903 Merge pull request #3037 from JosJuice/titles-txt-sort
DolphinWX: Fix sorting games by custom titles
2015-09-18 17:41:32 +12:00
Scott Mansell 3ef103d1c9 Merge pull request #3058 from lioncash/override
ControllerInterface: Fix -Winconsistent-missing-override warnings on OSX
2015-09-18 15:24:54 +12:00
Scott Mansell 7681d7b67a Merge pull request #3056 from degasus/master
VideoSW: Remove unused function
2015-09-18 05:53:31 +12:00
Scott Mansell 1c17d3d653 Merge pull request #3050 from lioncash/const
Jit_Util: Mark a class function as const
2015-09-17 17:14:18 +12:00
Scott Mansell deeb1d8370 Remove segfault from DX11 backend.
Instead of blindly using the expected width, clamp it to the stride of the
buffer which dx11 returns. This prevents use from reading invalid memory
at the end of textures.

This doesn't solve the base issue of what to do when a game tries to copy
from outside the efb. On real hardware it returns random noise (biased
to all ones)
2015-09-17 02:22:00 +12:00
Scott Mansell 45c1cfa078 Merge pull request #2242 from Stevoisiak/Titles.txt
GameListCtrl: Improvements for reading custom game titles
2015-09-13 14:03:47 +12:00
Scott Mansell 3e4b62797c Merge pull request #3033 from JosJuice/stick-names
Use official names for GameCube controller sticks
2015-09-13 13:14:10 +12:00
Scott Mansell c0a89c3bf4 Merge pull request #3009 from phire/depth_tested_pokes
Add some logging for depth tested efb color pokes.
2015-09-12 22:20:59 +12:00
Scott Mansell 44456bec0f Add some logging for depth tested efb color pokes. 2015-09-12 22:19:59 +12:00