702198f39b
Merge branch 'master' into primitive_restart
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2013-04-08 15:57:51 +02:00
4c40e70b8a
ogl: support glsl120
2013-04-08 14:50:58 +02:00
3897e1959e
ogl: one framebuffer per efb2tex texture
...
suggestion from nvidia/valve. let's see if it helps
2013-04-08 14:36:58 +02:00
deece78e19
Seriously, someone kill me.
2013-04-08 03:11:45 -04:00
48f3e962d6
Kill me now.
...
Fixes issue 6227.
2013-04-08 03:05:12 -04:00
3ed0a96367
Remove an extraneous comment indicator from DebuggerPanel.cpp in DolphinWX.
...
Was asked to remove it, so... yeah.
2013-04-08 01:47:51 -04:00
1db10b139c
Remove all tab/space mismatches from the DolphinWX project (at least 99%. I promise!)
...
Also fix up the dangling else's. Shit just looks incredibly ugly in terms of actual structure in the code.
I took the liberty of adding comments in FifoPlayerDlg.cpp, LogConfigWindow.cpp, LogWindow.cpp, and FrameAui.cpp to better explain some things.
If any comments are wrong, don't hesitate to complain.
2013-04-08 01:16:50 -04:00
5b2d9a7d9f
Rename the "Disable Dest. Alpha Pass" option to "Disable Destination Alpha" (GUI-only).
2013-04-07 21:41:25 +00:00
195336021f
Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects.
...
See Render.cpp, PixelShaderGen.cpp, and PixelShaderManager.cpp for most of the changes.
See VertexShaderManager.cpp for a logging typo fix.
See SWRenderer.cpp for a small typo fix for a message that gets swprintf'd in DrawDebugText.
See SWVertexLoader.cpp for a typo fix of an assert message.
Should slightly improve the readability of some of those files.
2013-04-07 17:11:29 -04:00
42e97e462c
Look for wiimotes when "Continuous Scanning" is enabled even if a device using the MS stack is not found.
...
Fixed issue 6215.
2013-04-07 14:21:20 -05:00
0ca7ea6c3f
D3D11: Fix glitched polygon edges when MSAA is enabled (this time without breaking OpenGL)
2013-04-07 20:58:48 +02:00
8ce0d43717
Allow enabling memory card writes for netplay clients, instead of just the server.
2013-04-07 13:04:44 -04:00
c7abf7e8d2
Allow disabling memory card writes in netplay.
...
Fixes issue 6217.
2013-04-07 12:18:07 -04:00
5f32febcf3
Apply re07a91930df0 to the software renderer.
2013-04-07 16:54:22 +02:00
b76c7cf4f3
Bumped up the LLE period to 12600 as it seemed to be a bit more stable.
2013-04-07 21:44:44 +10:00
52053f5d95
Forced an exception check after an interrupt is generated by the DSP. Changed the timing back to 3ms/5ms periods, fixing the slowdown and garbled AX audio.
...
Fixed Accurate VBeam emulation when DSP HLE audio is being used.
2013-04-07 16:27:46 +10:00
53368823cb
Merge branch 'real-wiimote-minor-fixes'
2013-04-06 16:57:55 -05:00
8a2109691a
Quick fix to get Zelda: Wind Waker booting again.
2013-04-07 07:18:28 +10:00
ecb4337209
Made the timing consistent between DSP HLE and DSP LLE. Fixes Lost Kingdoms II in DSP HLE mode.
2013-04-06 20:26:43 +11:00
4d81e0739d
Use an enum for efb scale values.
2013-04-06 01:49:13 -04:00
c32e2f33ac
Fix IORead return off-by-one error in Windows real wiimote code.
2013-04-05 21:45:35 -05:00
3c8477df03
Real Wiimotes: Invalidate last data report when any non-data input reports comes in.
2013-04-05 21:10:36 -05:00
518e7a7635
Adjusted the ARAM DMA transfer size again. Fixes the audio in the Sonic Mega Collection games.
2013-04-06 11:52:00 +11:00
ee163d1e49
Someone take my commit rights away.
2013-04-05 17:26:56 -04:00
6a5a522bba
Hastily committing untested code without making sure i didn't miss anything first? I would never!
2013-04-05 17:20:34 -04:00
e531970052
Round IR scale down to whole number if using 1.5x/2.5x IR, if game ini specifies -1 for EFBScale.
...
Fixes issue 6210.
2013-04-05 17:13:48 -04:00
3e8ba3f3e8
fix msaa detection
2013-04-05 07:08:32 +02:00
ceebed9268
Apply changes to Windows real wiimote code as suggested by bughunter2.
...
Fixed issue 6071.
2013-04-04 21:46:00 -05:00
f8e52bd83a
Eliminate some redundant constants.
2013-04-04 19:46:42 -05:00
71f4bf25a7
Make FifoQueue take advantage of rvalue references to avoid std::vector copies.
2013-04-04 19:34:50 -05:00
99da297951
Fix minor issue with real wiimote data report handling.
2013-04-04 19:34:00 -05:00
a2ebb2b324
ogl: remove "Missing Extension" from osd
...
I think it was the best place, but I can't see "this issue is because of ..." any more
2013-04-04 18:55:37 +02:00
d032f3fd79
Fix for the hang after close caused by my previews perf queries commit.
...
Sorry for that.
fix issue 6205
2013-04-04 12:53:06 -03:00
e11f5630b1
OGL: use GLEW_ARB_debug_output in debug builds
...
should also be used in normal build, but as our ubo "workaround" throws too much errors, it's disabled atm
2013-04-04 17:37:16 +02:00
a7c05dc922
Remove an unused variable in VideoConfig.cpp and SWVideoConfig.cpp
2013-04-04 09:32:28 -04:00
aaf6c3b753
Forced the exception check when the ARAM DMA transfer is between 32 and 320 blocks in size. Fixes Lost Kingdoms II.
2013-04-04 22:38:39 +11:00
39965e894d
Add native fullscreen support for OS X.
2013-04-03 21:20:43 -07:00
9f8841e960
Revert "D3D11: Fix glitched polygon edges when MSAA is enabled."
...
This reverts commit 61c327ba8b
2013-04-03 21:17:09 -07:00
0c4713a152
ups missing file for my last commit sorry
2013-04-03 19:56:35 -03:00
c4bc20b4d9
Adds support for PE performance metrics in the D3D9 backend
2013-04-03 19:53:48 -03:00
d06379fc59
Fix 32bit Linux. GCC's lrotl/lrotr instrinsic functions are 32bit when building for 32bit, we require 64bit at all times, so keep using our own instead.
2013-04-03 12:43:17 -05:00
61c327ba8b
D3D11: Fix glitched polygon edges when MSAA is enabled.
2013-04-03 18:56:33 +02:00
b5676fe82b
Fix GCC 4.8 compiling. GCC 4.8 now defines _rotl/_rotr/_lrotl/_lrotr.
2013-04-03 10:52:26 -05:00
3fdc46877a
Make the GUI show a translated "No audio output" sound backend string.
2013-04-03 09:22:39 -05:00
1dd1ebb8bd
Fix ARM building.
2013-04-03 05:20:41 +00:00
6371a6f15d
Fix some more strings for translation, and update the catalog.
2013-04-02 17:44:27 -05:00
92e82a4160
Suppress warnings.
2013-04-02 15:02:02 -05:00
27e08f66b5
Fix build on OS X
2013-04-02 21:15:04 +02:00
eb06c62a6e
Merge branch 'new-ax-hle'
...
GC and Wii games using the AX UCode should now work almost perfectly with DSP
HLE. If you get any issue, make sure the "DSP on dedicated thread" option is
disabled, and try setting framelimit to "Audio".
As a side effect, DSP HLE should not desync anymore (making it usable in
netplay and TAS) with AX games.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
2013-04-02 21:00:44 +02:00
9860137291
Initialize the audiocommon mixer on the first write to DSPCR, even if DSP is not enabled. Fixes issue 6192.
2013-04-02 20:42:07 +02:00
d951c4c374
real buildfix
2013-04-02 13:07:51 -05:00
c65473d9d3
Probably a sloppy buildfix.
2013-04-01 23:30:05 -05:00
69779a4321
Fix loading of "themes" with non-ascii character names.
...
Fixed issue 6189.
Why did GetUserPath return a non-const ref to string..?
2013-04-01 23:22:20 -05:00
6e708005df
Implement AXWii commands 08/09, aka. "upload AUXA/AUXB and use it as a temp buffer to mix to MAIN L/R/S and AUXC L", aka. "what the fuck were they thinking?!"
2013-04-02 04:12:17 +02:00
0220fd1940
Implemented command 03: ADD_SUB_TO_LR
2013-04-02 03:23:48 +02:00
74dee41b87
Add implementation for command 02: SUB_TO_LR
2013-04-02 03:10:29 +02:00
5c67a0bcf6
Partial fix for the EA Wii games having no sound - implement the second OUTPUT command in AXWii. Sound in videos and musics still don't play.
2013-04-02 02:53:19 +02:00
4ba12be669
We can use unordered_map without pain now!
2013-04-01 19:25:32 -05:00
f36e18593b
More log elaborating. Final time I'm doing this.
...
Logs should actually be somewhat understandable to some people outside of programming and stuff (in a way). It's certainly better than being bombarded by abbreviations when errors/general logging occur, at least.
2013-04-01 18:45:23 -04:00
04913a855e
Update function descriptions in GCPad.cpp and Wiimote.cpp
...
Add inputs. Those that still need a description are tagged with [Description Needed]
2013-04-01 18:07:44 -04:00
a562c7c1f6
As requested apply the same changes made by rev 6958822f19 to the D3D9 backend.
...
handle v-sync changed while the emulation is running.
thanks to neobrain for pointing the missing functionality.
2013-04-01 14:23:48 -03:00
49d809ac0e
Merge branch 'osx-libcxx'
2013-04-01 18:17:49 +02:00
58159a1693
Some more logging typos and clarifications. Missed these in my last commit.
...
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.
A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).
Elaborations can be seen in WGL.cpp
I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
2013-04-01 00:10:54 -04:00
5ae8bec2fd
Disable dual source blend until a valid support test is found
2013-03-31 21:15:58 -03:00
f432d6038e
Fix some typos and correct some capitalizations in the log messages.
...
Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 19:13:30 -04:00
45651098f6
Use a brute force approach to test for Dual source blend support.
...
Sorry for a direct commit to the main branch but i need fast feedback, and i don't want to leave problematic code in the main branch for a long time.
if this approach does not work for the drivers with problems will transform dual source blend to an option in the D3D9 backend.
I appreciate the help of the people that tested my last commit and thanks to neobrain for pointing this solution.
2013-03-31 20:02:13 -03:00
a60e1a3db8
ShaderGen: Remove some TODOs and fix an issue with per pixel lighting.
2013-03-31 23:57:39 +02:00
f57b902d33
PixelShaderGen: Cleanups.
2013-03-31 23:53:46 +02:00
f6d65a636e
ShaderGen: Fix per pixel lighting.
2013-03-31 23:29:33 +02:00
248d56d930
ShaderGen: Small optimization.
2013-03-31 20:55:57 +02:00
aabd8ce664
Add retina display support for Mac.
2013-03-31 11:36:42 -07:00
31500f2522
Fix Intel Ironlake since it doesn't support version 120 of GLSL. I don't have Ironlake so it is hard to test. Dropping the shaders to version 120 worked here for me, ATI may be giving me some slack though.
2013-03-30 23:27:24 -05:00
4d27315cd1
Initialize the AX Thread after the sync objects are initialized
2013-03-31 01:55:41 +01:00
60b43eb8d3
Support the old AXWii version used in games like Wii Sports or Excite Truck
2013-03-31 00:25:00 +01:00
276c457bed
Basic framework to support the old AXWii version used in Wii Sports and Excite Truck
2013-03-30 22:22:57 +01:00
6958822f19
only apply vsync on changes
...
nvidia over bumblebee slows down on changes
2013-03-30 22:17:39 +01:00
79c0316243
Disable the polyphase resampler - it causes audio glitches with non integer ratios
2013-03-30 16:59:06 +01:00
04f9c6793b
Fix the argument to the samples reading callback in voice processing - should fix issues with wiimote audio, untested
2013-03-30 14:39:59 +01:00
a813f9e13c
Support loading polyphase resampling coeffs from User and Sys in HLE
2013-03-30 14:38:14 +01:00
e3b0a2c9bf
Add an option to run the AX processing on the CPU thread. Fixes timing issues causing audio glitches on Wii, and should improve the overall stability of AX HLE.
2013-03-30 14:02:30 +01:00
c271082ec5
Add volume ramping for MAIN output, separate old volume values for each AUX channel and refactor
2013-03-30 00:55:55 +01:00
cdddb26bba
Apparently override is less fun than I thought.
2013-03-29 22:29:37 +01:00
2afd892e46
ShaderGen: More interface cleanups. Less wtfs :)
2013-03-29 22:24:49 +01:00
4b09f525f6
Fix AUX volume mixing in AXWii: implement volume ramping and MixAdd properly. Home menu sounds now work properly.
2013-03-29 22:22:24 +01:00
e31c2aa601
ShaderGen: Cleanup uid data writing.
2013-03-29 21:53:57 +01:00
ef501137be
Fix audio glitching at the end of a voice because of bad non-looping sound handling in AXWii
2013-03-29 21:02:27 +01:00
9eccd56ef0
PixelShaderGen: Some cleanups.
2013-03-29 20:59:03 +01:00
3c02f227db
PixelShaderManager: Disable constant cache (won't work in the non-UBO path of the opengl backend).
...
ShaderGen: Replace typeid usage with more general code.
2013-03-29 20:35:31 +01:00
485bd70df2
Fix some strings for translation and update the pot file to include
...
those strings once again.
2013-03-29 11:05:22 -05:00
194ada2481
More MSVC 2010 build fixes
2013-03-29 07:55:56 -07:00
38db520617
MSVC 2010 does not have <mutex> or <thread> either, adding the Std* files back
2013-03-29 07:53:45 -07:00
a8513e4605
Re-add StdConditionVariable, MSVC 2010 does not support <condition_variable>
2013-03-29 07:42:41 -07:00
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
b73941c0ea
Use libc++ for Mac OS X builds now that we require >= 10.7 anyway
2013-03-29 07:29:31 -07:00
b2517c0308
More build fixes.
2013-03-29 15:08:00 +01:00
4e9c3db545
OSX build fix.
2013-03-29 15:03:16 +01:00
41c4108ce6
OpenGL: Reimplement shader uid debugging.
2013-03-29 14:56:01 +01:00
f2a8fbb314
PixelShaderGen: Slightly reduce the number of redundant shader compilations.
2013-03-29 14:54:13 +01:00
ca8554e7d1
first try of primitive restart index generator
...
Convert all quads+triangles into trangle_strip and uses primitive restart to split them.
Speed up triangle_strip, but slows down all others primitive formats.
Only implemented in ogl.
2013-03-29 14:27:33 +01:00
e9b236be05
OSX sucks at c++11
2013-03-29 13:55:55 +01:00
a997824f68
Add missing <functional> header include
2013-03-29 13:51:52 +01:00
4dc1ffbb20
Refactor the resampling code to avoid having two polyphase resampling implementations (normal/wm)
2013-03-29 13:49:36 +01:00
85b498ba97
Update the right cur_addr_frac after wiimote audio resampling
2013-03-29 13:18:30 +01:00
c743e75d92
fixes for my last commit
2013-03-29 00:41:36 -03:00
57d4ba8dcc
Merge branch 'master' into new-ax-hle
2013-03-29 00:49:07 +01:00
40d919b352
Implement dual source blending to avoid unneeded alpha pass.
...
this implementation does not work in windows xp (sorry no support for dual source blending there).
this should improve speed on older hardware or in newer hardware using super sampling.
disable partial fix for 4x supersampling as I'm interested in knowing the original issue with the implementation to fix it correctly.
remove the deprecation label from the plugin while I'm working on it.
2013-03-28 20:08:51 -03:00
fb28349056
VideoSoftware: Fail less at clamping.
2013-03-28 23:34:14 +01:00
6e88ae9695
Recommend Direct3D 11 or OpenGL instead of Direct3D 9.
2013-03-28 23:34:14 +01:00
c10d9ea87a
Clean up blending code a bit.
2013-03-28 23:00:19 +01:00
8a33d49de2
buildfix for my last commit on Mac OSX
2013-03-28 18:32:59 -03:00
246907d371
Small Blending logic fix for opengl backend
2013-03-28 18:04:33 -03:00
b2575c6280
Removed some redundant code introduced in the last commit.
2013-03-29 00:53:30 +11:00
9b7db5954f
Rounded the loop addresses to the nearest 16bit value in the loop comparison.
...
Fixes issue 6160.
2013-03-29 00:43:41 +11:00
53377425d1
OGL: enable buffersubdata in detection
2013-03-28 12:18:39 +01:00
e38e48923d
Readded the tracking of the FIFO Writes.
...
Fixes issue 6165.
2013-03-28 19:36:37 +11:00
b1dd14c319
Fix a slight leak in LogManager.
...
m_debuggerLog wasn't ever deleted in the destructor.
2013-03-27 23:39:48 -04:00
2444fdbbdd
I missed some files required for our GLInterface.
2013-03-27 21:18:07 -05:00
507f53e226
Fixed issue 6119.
2013-03-27 14:26:45 -05:00
6fe5f5a6ba
[DolphinWX] Remove a duplicate conditional in Frame.cpp
2013-03-27 15:09:04 -04:00
5cea0d9def
Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
...
This reverts commit efcb2abe9b
2013-03-27 13:06:15 +11:00
a171525df6
Fix Windows crash.
2013-03-27 01:33:27 +01:00
45c70be83f
Fix Windows build, try 5.
2013-03-27 00:20:25 +01:00
11fae2e1cb
Fix Windows build, try 4.
2013-03-27 00:17:46 +01:00
f8d2936840
Fix Windows build, try 3.
2013-03-27 00:13:23 +01:00
98362e5934
Fix Windows build, try 2.
2013-03-26 23:44:41 +01:00
24ab51f9f6
Fix Windows build, try 1.
2013-03-26 23:35:14 +01:00
364a5093d9
ShaderGenCommon: Replace the GenOutput enum by using typeid instead.
2013-03-26 23:21:08 +01:00
0e31943216
ShaderGenCommon: Introduce a common shader generator interface to make stuff less confusing.
2013-03-26 23:03:10 +01:00
3253603ae7
Merge 'master' into shader-uids-awesome.
...
Conflicts:
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 22:21:19 +01:00
b75a617d8a
VertexShaderGen: De-uglify VS output structure writing
2013-03-26 19:36:59 +01:00
30f1a4b4fe
Partially revert "Now CG plays nice with this new stuff."
...
This reverts commit 3943840d5c
2013-03-26 19:36:59 +01:00
ae62af8a93
Array overrun fixed in VertexShaderCache for the DX11 plugin.
...
vs_constant_offset_table only has a size of 239. It was originally iterating up to element 241.
2013-03-26 09:19:19 -04:00
b83be4875a
Fixed DSPTool build.
2013-03-26 21:50:49 +11:00
6a6c086b50
Windows build fix
2013-03-26 18:48:57 +11:00
b8b5afa323
Go back to assuming every HID device is a wiimote on Windows.
...
Fixed issue 6117.
Unfixed issue 6031.
2013-03-25 21:14:55 -05:00
0994a5828d
VideoSoftware: Improve fog range adjustment by using less magic and more comments.
2013-03-26 00:57:45 +01:00
3ab4e35582
revert RasterFont for VideoSoftware
...
Backends shouldn't depend on each other. Here RasterFont depends on ProgramShaderCache, which itself depends on global config again ...
2013-03-26 00:05:46 +01:00
e5841f233a
ogl: fix virtual xfb
2013-03-25 23:23:32 +01:00
beb083721a
Windows build fix from web interface...
2013-03-25 21:43:32 +00:00
51290fd482
Adjusted the audio loop criteria, using >= on the Wii and == on GC. This fixes the audio static that occurred in Wii games after hours of play.
...
Fixes issue 5938.
Fixes issue 6067.
2013-03-26 08:31:20 +11:00
b00201dcbd
Merge branch 'Fast-EE'
...
* Fast-EE:
Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
Forced the external exception check to occur sooner by changing the downcount.
2013-03-26 08:24:21 +11:00
0ccaaee38c
Forced the exception check only for ARAM DMA transfers.
...
Removed the Eternal Darkness boot hack and replaced it with an exception check.
2013-03-26 08:23:20 +11:00
ae146e8bc7
VideoSoftware: Implement fog range adjustment, fixing issue 6147.
2013-03-25 21:13:31 +01:00
d4fadf4b6f
implement 4xSSAA for OGL
...
I don't think it's needed, but its requested often
2013-03-25 15:45:10 +01:00
3d5e0a6d3d
move ogl-only settings into backend
2013-03-25 15:14:24 +01:00
7034c79ab9
Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still.
2013-03-24 21:06:34 -05:00
81e261eb68
Fix description of disable fog, and move it to enhancements tab.
2013-03-24 15:47:18 -04:00
dfa1845ae1
Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
2013-03-25 01:01:29 +11:00
4fa61a1e7f
Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
2013-03-25 00:57:53 +11:00
1d550f4496
Forced the external exception check to occur sooner by changing the downcount.
...
Fixes issue 5825.
2013-03-25 00:47:44 +11:00
degasus