Commit graph

19366 commits

Author SHA1 Message Date
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
Scott Mansell
55cb358b4c Merge pull request #3398 from dolphin-emu/revert-3315-test
Revert "ShaderGen: Toggle value of uninitialized color."
2015-12-27 10:29:08 +13: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
JosJuice
4ddc04da07 Merge pull request #3396 from lioncash/constant
Fifo: Convert define into constant
2015-12-25 22:42:38 +01: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
Jules Blok
7ca9a438a8 Merge pull request #3385 from SMarioMan/master
Add StereoConvergence settings to various gameini files
2015-12-24 12:02:04 +01:00
SMarioMan
e3fd5604c6 Add StereoConvergence settings to various gameini files. 2015-12-24 03:43:51 -05:00
Scott Mansell
a227daac56 Merge pull request #3394 from dolphin-emu/revert-3373-temp-settings-ini-hotfix
Revert "Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration."
2015-12-24 21:33:22 +13: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
Mathew Maidment
cfd300586a Merge pull request #3391 from rohit-n/build-pch
Fix building with PCH disabled.
2015-12-23 17:36:40 -05:00
Rohit Nirmal
4163ab6a0e Fix building with PCH disabled. 2015-12-23 09:54:33 -06:00
Markus Wick
82e97ef75d Merge pull request #3390 from stenzek/ogl-fb
OGL: Fix for black framebuffer when resolution/msaa mode changes
2015-12-23 14:35:31 +01:00
Stenzek
12ef4c8ae0 OGL: Fix for black framebuffer when resolution/msaa mode changes 2015-12-23 23:29:32 +10:00
Pierre Bourdon
3250d80d21 Merge pull request #3389 from stenzek/d3d-fb-crash-fix
D3D: Fix crash on startup/resize
2015-12-23 14:21:02 +01:00
Stenzek
4d48a7abfc D3D: Fix crash on startup/resize 2015-12-23 23:07:31 +10:00
Markus Wick
81f379b409 Merge pull request #3384 from lioncash/vertexloader
VertexLoaderBase: Get rid of explicit delete and new
2015-12-23 03:34:31 +01: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
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
Scott Mansell
14e976a5f1 Merge pull request #3380 from lioncash/fb
FramebufferManager: Get rid of raw new and delete
2015-12-23 12:16:28 +13: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
2c5965be88 UserPreferences: Move all stereoscopy options to the stereoscopy section. 2015-12-22 23:16:28 +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
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
Mathew Maidment
98c0c79895 Merge pull request #3376 from spxtr/DQt2
Use const reference, explicit, final, and override consistently in DQt2
2015-12-22 06:33:37 -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
Pierre Bourdon
4c428ed019 Merge pull request #3372 from lioncash/framebuffer
FramebufferManagerBase: Get rid of explicit delete and new
2015-12-21 22:48:13 +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