Commit graph

14189 commits

Author SHA1 Message Date
Markus Wick
aabcd441d9 Merge pull request #3381 from Armada651/revert-3076
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
2015-12-28 10:18:32 +01:00
Markus Wick
281860eafa Merge pull request #3400 from lioncash/shadergen
ShaderGen: Get rid of static buffers
2015-12-28 10:09:11 +01:00
Markus Wick
cec1a75976 Merge pull request #3296 from sepalani/r_menu
DebuggerViews: Fixed nullptr dereferences
2015-12-28 10:02:53 +01:00
Scott Mansell
790a836736 FifoAnalyzer: Fix a few warnings that visual studio missed. 2015-12-28 20:20:30 +13:00
Stenzek
5cb047f449 D3D: Fix compilation error on windows 2015-12-28 15:50:01 +10:00
Markus Wick
294bb75316 Merge pull request #3295 from stenzek/d3d-xfb-msaa
D3D: Fix multiple issues relating to MSAA
2015-12-28 01:13:42 +01:00
Scott Mansell
52d6a7505a Merge pull request #3239 from phire/cleanup-fifo-analyzers
Cleanup fifo analyzers (and fix major bugs with fifo recording)
2015-12-28 11:14:09 +13:00
Sepalani
4d3f05ddf8 DebuggerViews: Fixed nullptr dereferences 2015-12-27 19:57:58 +04:00
Lioncash
c5f123a70b ShaderGenCommon: Remove unnecessary static keywords
Functions defined in a header should be inline only, otherwise program
code is generated for every other file that calls said functions
2015-12-26 18:02:54 -05:00
Lioncash
c151fe582f ShaderGenerators: Remove unnecessary inline keywords
Static by itself is sufficient
2015-12-26 17:57:32 -05:00
Lioncash
8ce3a4aa70 ShaderGeneration: Get rid of static buffers 2015-12-26 17:01:54 -05:00
rabbott99
5d61e067a0 CheatSearchTab: Use an enum for filter masks rather than ints 2015-12-26 16:51:06 -05:00
Scott Mansell
bed102ae89 Revert "ShaderGen: Toggle value of uninitialized color." 2015-12-27 02:28:29 +13:00
Scott Mansell
be8410dcad Merge pull request #3383 from Sonicadvance1/compile_fixes
Compile fixes
2015-12-27 02:16:55 +13:00
skidau
5555822ca2 Catered for the case where ADPCM audio would loop before the end of the stream. Patch by hk.konpie. 2015-12-26 22:57:43 +11:00
Lioncash
a8ab156a29 Fifo: Convert define into constant
Also moves it to the cpp file where it's used.
2015-12-25 16:07:04 -05:00
Mateus B. Cassiano
7f1fe7a6cb Always load system fonts from IPL dump, if available 2015-12-24 15:57:54 -03:00
Scott Mansell
0216879d3e Revert "Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration." 2015-12-24 18:25:22 +13:00
skidau
f96f90b334 Ignored the mouse position unless the cursor is over the Dolphin window.
Fixes issue 8673.
2015-12-24 09:44:26 +11:00
Rohit Nirmal
4163ab6a0e Fix building with PCH disabled. 2015-12-23 09:54:33 -06:00
Stenzek
12ef4c8ae0 OGL: Fix for black framebuffer when resolution/msaa mode changes 2015-12-23 23:29:32 +10:00
Stenzek
4d48a7abfc D3D: Fix crash on startup/resize 2015-12-23 23:07:31 +10:00
Lioncash
8371c428cd VertexLoaderBase: Get rid of explicit delete and new 2015-12-22 20:09:54 -05:00
Mathew Maidment
3cf16f8573 Merge pull request #3382 from lioncash/render
Render: Get rid of explicit new and delete
2015-12-22 19:26:26 -05:00
Ryan Houdek
eb2d4935cd Including missing headers required for non-pch builds and other architectures 2015-12-22 18:20:48 -06:00
Ryan Houdek
eaf21b3c80 Work around Google's trash NDK 2015-12-22 18:20:17 -06:00
Lioncash
da0e647346 Render: Get rid of explicit new and delete 2015-12-22 19:10:05 -05:00
Jules Blok
8bda12bcfd Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
2015-12-23 00:35:19 +01:00
Markus Wick
a55af16131 Merge pull request #3350 from Armada651/video-stereoscopy
VideoConfig: Move all stereoscopy options to the stereoscopy section.
2015-12-23 00:20:37 +01:00
Lioncash
e422af9cce FramebufferManager: Get rid of raw new and delete 2015-12-22 18:06:05 -05:00
Jules Blok
7b4c4bfc5e VideoConfig: Fix stereoscopy preset settings.
PR #3076 looks to be pretty poor quality and should be reverted.
2015-12-22 23:24:05 +01:00
Jules Blok
fa207ef8a0 VideoConfig: Move all stereoscopy options to the stereoscopy section. 2015-12-22 23:16:27 +01:00
Jules Blok
9a1b2f68cc ISOProperties: Replace the ConvergenceMinimum option by the Convergence option.
The ConvergenceMinimum was replaced by Convergence in the GameINI.
2015-12-22 23:16:27 +01:00
Jules Blok
c49bb57e09 VideoConfig: Move all GameINI stereoscopy options to the stereoscopy section. 2015-12-22 23:16:27 +01:00
JosJuice
ed8fa5ba77 DolphinWX: Add missing m_ListElfDol cases 2015-12-22 16:26:31 +01:00
Mathew Maidment
1b69743ba1 Merge pull request #3362 from lioncash/memory
NANDContentLoader/WiiWAD: Get rid of raw delete and new
2015-12-22 06:39:12 -05:00
spxtr
21032d76a8 Use const reference, explicit, final, and override in DQt2. 2015-12-21 19:46:03 -08:00
Scott Mansell
ce6de78854 Merge pull request #3250 from JosJuice/loadgameini-condition
BootManager: Remove unnecessary LoadGameIni condition
2015-12-22 13:24:09 +13:00
JosJuice
1b946c2ff3 BootManager: Remove unnecessary LoadGameIni condition 2015-12-22 00:54:54 +01: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
Admiral H. Curtiss
4d2e9abba7 BootManager: Slightly clean up the config_cache stuff by pulling the save and restore into their own methods. 2015-12-22 00:30:25 +01:00
Admiral H. Curtiss
3149140052 Config: Hotfix to prevent per-game settings from ie. GameINIs being stored to the global user configuration. 2015-12-22 00:16:29 +01:00
Lioncash
f448c6e291 FramebufferManagerBase: Get rid of explicit delete and new 2015-12-21 15:57:48 -05:00
Pierre Bourdon
9039cc5860 Merge pull request #3371 from lioncash/streambuffer
StreamBuffer: Minor changes
2015-12-21 18:56:08 +01:00
Mathew Maidment
4c62a5c0a4 Merge pull request #3370 from rohit-n/warnings
Silence -Wshadow and -Wmaybe-uninitialized warnings.
2015-12-21 11:44:51 -05:00
Mathew Maidment
44a3578993 Merge pull request #3367 from spxtr/DQt2
DQt2: Use a separate INI file for UI settings
2015-12-21 11:33:56 -05:00
Rohit Nirmal
aaa89d4f73 Silence -Wshadow and -Wmaybe-uninitialized warnings. 2015-12-21 10:06:07 -06:00
Lioncash
d20ba76ab3 StreamBuffer: Make factory function return a std::unique_ptr 2015-12-21 10:21:38 -05:00
Lioncash
ec71452706 StreamBuffer: Correct function casing 2015-12-21 10:09:03 -05:00
Lioncash
1eea95a5be StreamBuffer: Use std::array for fences 2015-12-21 10:07:56 -05:00
Lioncash
7b69fec8e7 StreamBuffer: Remove unnecessary inline specifiers
Methods defined directly in class bodies are inline by default
2015-12-21 10:04:14 -05:00
Lioncash
f295182833 VideoBackends: Simplify initialization and deinitialization of resources
Approximately three or four times now, the issue of pointers being
in an inconsistent state been an issue in the video backend renderers
with regards to tripping up other developers.

Global (ugh) resources are put into a unique_ptr and will always have a
well-defined state of being - null or not null
2015-12-20 22:40:37 -05:00
hdcmeta
50b9ab4541 Set g_vertex_manager to nullptr on DX11 backend shutdown.. OGL backend already does this 2015-12-20 17:02:36 -08:00
spxtr
3a4a60f937 Use a separate INI file for UI settings. 2015-12-20 15:36:39 -08:00
Pierre Bourdon
2842897d55 Merge pull request #3363 from lioncash/tmd
Volume: Make GetTMD return a vector
2015-12-20 09:54:24 +01:00
spxtr
f9f2b2fd36 Move the menu bar into its own file. 2015-12-19 21:24:48 -08:00
Stenzek
a61fc372bb VideoCommon: Change PokeEFB to take a pointer rather than a vector
This saves allocating a vector for the pass-through path.
2015-12-20 14:42:14 +10:00
Lioncash
cbeb7034eb Volume: Make GetTMD return a vector 2015-12-19 18:00:44 -05:00
Lioncash
c78c54c546 NANDContentLoader/WiiWAD: Get rid of raw delete and new 2015-12-19 17:37:09 -05:00
Stenzek
7b628c99ec D3D: Implement vectored efb pokes, increase util vertex buffer size to 64KiB 2015-12-20 00:31:58 +10:00
degasus
5e9ab28ed1 VideoSW: Clear normal vertex data.
This data might not be initialized but used for lighting.
This matches our ShaderGen usage in VertexShaderGen.cpp:166.
2015-12-19 10:51:42 +01:00
Markus Wick
e638775bc7 Merge pull request #3351 from degasus/wip
Real Wiimote: Don't delay speaker data.
2015-12-18 15:30:49 +01:00
Pierre Bourdon
de21da5fb2 Merge pull request #3315 from degasus/test
ShaderGen: Toggle value of uninitialized color.
2015-12-18 14:21:37 +01: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
Mathew Maidment
7a78df2624 Merge pull request #3349 from JosJuice/am-baseboard
DolphinWX: Change "AM-Baseboard" string to "AM Baseboard"
2015-12-17 18:25:54 -05:00
Mathew Maidment
15580e6a3d Merge pull request #3305 from spxtr/DQt
DQt2: Refactors.
2015-12-17 18:24:52 -05:00
degasus
94ae134bf4 Real Wiimote: Don't delay speaker data. 2015-12-17 23:48:43 +01:00
JosJuice
b4b1844fe8 DolphinWX: Change "AM-Baseboard" string to "AM Baseboard"
It's so that the string in ControllerConfigDiag will match the string
in GameCubeConfigPane. Right now, it unnecessarily appears twice in
the list of strings to translate.
2015-12-17 22:25:15 +01:00
JosJuice
03b4e16e0e DolphinQt: Attempt at fixing issue 9170 2015-12-17 21:49:28 +01:00
JosJuice
9a0b70cc51 Fix encoding for savestate slots
StrToWxStr is needed, otherwise the string will not be read as UTF-8.
2015-12-17 11:25:14 +01:00
Markus Wick
cc6442734d Merge pull request #3340 from ShadowsFriend/missing_icons_regression
DolphinWX: Fix items vanishing from toolbar
2015-12-16 17:50:51 +01:00
spxtr
f2e9321591 Repackage the unique_ptr in GameFile into a QSharedPointer. 2015-12-15 21:00:56 -08:00
Christian Widmer
9dd9a75dbe DolphinWX: Fix items vanishing from toolbar
Commit 33487ab5f2 introduced a regression
where items would vanish from the toolbar. This adds a call to Realize()
after the reinsertions of the play/pause button as required per
documentation.

Thanks to Simonwayneee for noticing this!
2015-12-16 00:18:04 +01:00
Markus Wick
c310b3f0e6 Merge pull request #3309 from JosJuice/reload-banner-without-volume
Don't read from volume when reloading Wii banners
2015-12-15 18:48:49 +01:00
Markus Wick
2990df3f59 Merge pull request #3265 from JosJuice/volumedirectory-simplifications
DiscIO: Small VolumeDirectory simplifications
2015-12-15 18:36:49 +01:00
Markus Wick
e15b6e1a37 Merge pull request #3162 from lioncash/rast
Software: Minor changes to Rasterizer
2015-12-15 18:22:42 +01:00
Markus Wick
25a584626f Merge pull request #3127 from JosJuice/read-return
DiscIO: Improve error handling for reading integers
2015-12-15 18:16:40 +01:00
Markus Wick
e4b83d17bf Merge pull request #3270 from JosJuice/more-translations
Mark more strings for translation
2015-12-15 18:13:26 +01:00
Markus Wick
3e2ac3df43 Merge pull request #3292 from JosJuice/state-str
State: Don't use memcpy and memcmp with strings
2015-12-15 17:42:35 +01:00
Markus Wick
556371b2bc Merge pull request #3333 from ShadowsFriend/pausebutton_fix
DolphinWX: Fix label change for the play/pause button
2015-12-15 17:40:25 +01:00
Markus Wick
67557e1f91 Merge pull request #3330 from lioncash/alloc
EXI/SI: Get rid of explicit delete and new
2015-12-15 17:38:52 +01:00
Markus Wick
164e045123 Merge pull request #3317 from lioncash/null
NullSound: Minor changes
2015-12-15 17:38:37 +01:00
degasus
e26d9f7c35 MSAA: Store samples in ini files. 2015-12-15 09:41:01 +01:00
JosJuice
cbfab2a754 DiscIO: Improve DiscScrubber::ReadFromVolume error handling 2015-12-14 10:01:38 +01:00
JosJuice
bd67333da9 DiscIO: Improve CBlobBigEndianReader error handling 2015-12-14 09:56:44 +01:00
JosJuice
c01265db34 DiscIO: Unify CBlobBigEndianReader 2015-12-14 09:38:23 +01:00
JosJuice
c7e747d775 DiscIO: Improve IVolume::Read32 error handling
Callers can now check whether reads fail, either by checking the return
value or by setting the buffer to a known bad value and seeing if it stays
untouched. I've added error checks to FileSystemGCWii and Boot_BS2Emu,
but not to Boot since it doesn't check any of its other reads either.
2015-12-14 09:38:21 +01:00
Pierre Bourdon
2e5c94865b ZeldaHLE: Add support for New Play Control! Pikmin 1 2015-12-14 05:44:08 +01:00
booto
3899667c25 VI: wait until start of ACV to sample xfb addr 2015-12-14 10:44:54 +08:00
Jules Blok
3f7bf5ca93 VideoConfigDiag: Snap the convergence slider. 2015-12-13 22:58:38 +01:00
Jules Blok
ee657c04fe VideoConfig: Change convergence setting to percentage value. 2015-12-13 22:58:16 +01:00
Pierre Bourdon
e670d29dfe Merge pull request #3335 from ShadowsFriend/nopch_fix
Core: Fix build with portaudio enabled and pch disabled
2015-12-13 22:26:42 +01:00
Christian Widmer
5818d72af4 Core: Fix build with portaudio enabled and pch disabled
Includes cstring in EXI_DeviceMic.cpp to fix the undeclared function
errors for memset and memcpy when building with portaudio enabled and
pch disabled. Also adds the std:: prefix to those function calls
because there is no guarantee that they are put in the global namespace
when using cstring.

Thanks to David Brooke for noticing this!
2015-12-13 19:44:54 +01:00
Ryan Houdek
d9999bf30c Fix minor memory leak in WGL interface.
Would have a memory leak on game end
2015-12-13 11:42:18 -06:00
Ryan Houdek
78dda1cf79 [OGL] Update extension checks in Render.
This was relying on behaviour that GLExtensions was adding fake extensions to the supported list with ES.
This no longer happens so it needed to be changed.
2015-12-13 11:39:45 -06:00
Ryan Houdek
b620b26f8f [GLExtensions] Improve the extension loader.
This removes some nonsense in the extension loader where under an ES context we would still pull all function pointers and just continue onward if we
fail to pull one.
Now function pointers are only pulled if the version of GL or ES actually supports that function.
2015-12-13 11:37:07 -06:00
Ryan Houdek
6d2fd8ae37 [GLExtensions] Support ORing of extensions when checking for support.
Makes my life easier.
2015-12-13 11:35:55 -06:00
Christian Widmer
33487ab5f2 DolphinWX: Fix label change for the play/pause button
This fixes changing the play/pause button's label depending on the
emulation state. Before, wxToolBarToolBase's SetLabel() function was
used. This function, however, is not implemented in wxGTK which leads to
the label not changing on linux when the button is clicked. Although the preferred
method (according to the wxWidgets documentation) to change the properties
of a tool is to use the toolbar's setters, there is no such setter for
the label. Therefore, this implements a workaround where the
button is deleted and readded afterwards with the updated properties.

Thanks to linkmauve for noticing this!
2015-12-12 23:28:34 +01:00
Lioncash
cc75f2ea14 SI: Get rid of explicit delete and new 2015-12-12 14:41:45 -05:00