degasus
382be2aabd
Merge branch 'master' into GLSL-master
...
Conflicts:
.gitignore
2013-03-12 11:28:56 +01:00
skidau
83fc5f4747
Merge branch 'FIFO-BP'
...
# By skidau (30) and Pierre Bourdon (1)
* FIFO-BP: (31 commits)
Set g_bSignalTokenInterrupt on the main thread. Fixes the random hang in Harry Potter: Prisoner of Azkaban.
Used a scheduled event to generate the ARAM DMA interrupt if the DMA is greater than a certain size. Fixes NFS:HP2 GC.
Bumped up the disc transfer speed enough to prevent audio stuttering in Gauntlet: Dark Legacy.
Enabled Synchronise GPU on "SPEED CHALLENGE - Jacques Villeneuve's Racing Vision". Required to go in-game.
Added direct GameCube controller commands to the Serial Interface emulation. Fixes the controls in MaxPlay Classic Games Volume 1 and the Action Replay disc.
Increased the FIFO buffer size to 2MB from 1MB. Fixes Killer 7's Angel boss.
Used an immediate GenerateDSPInterrupt when transferring data from ARAM to MRAM and a scheduled DSP interrupt when transferring data from MRAM to ARAM.
Fixes the audio cutting in and out in the Resident Evil GC games using DSP HLE. Triggered the ARAM interrupt by the scheduler instead of directly in function.
Implemented proper timing for the sample counter in the AudioInterface, removing the previous hack. Cleaned up some of the audio streaming code.
Skipped the EE check if there is a CP interrupt pending.
Disabled "Speed up disc transfer" from the ZTP GC game ini.
Removed the disc seek times for GC games and removed the disc speed option on Wii games. Checked for external exceptions only in mtmsr.
Delayed the interrupts in the EXI Channel.
Merge aram-dma-fixes (r76a13604ef49b522281af75675f044d59a74e871)
Added a patch that bypasses the FIFO reset code in Wallace and Gromit: Project Zoo, allowing it to go in-game.
Made vertex loading take constant time.
Increased the cycle time of the vertex command. Fixes "Speed Challenge: Jacques Villeneuve's Racing Vision".
Moved the setting of the Finish interrupt signal back to the main thread as it was causing Wii games like Resident Evil 4 (Wii) to hang.
Profile stores, fp stores and ps stores only to the fifo write addresses list. This should make the JIT a little faster as it will not be checking for external exceptions unnecessarily.
...
Conflicts:
Source/Core/VideoCommon/Src/PixelEngine.cpp
2013-03-12 19:47:59 +11:00
Ryan Houdek
8406d9972d
Fix JIT from rebasing on PPSSPP ArmEmitter.
2013-03-12 02:35:29 +00:00
Ryan Houdek
b94b4a9e8f
Rebase ArmEmitter on PPSSPP's base. The loadstores are making my heart cry at this point.
2013-03-11 13:57:55 -05:00
degasus
e1ca002937
osx: only use accelerated backends
2013-03-11 16:36:07 +01:00
degasus
b43c2e4d13
use correct color in ascii ari shader
...
still slow as hell, but it looks much nicer
sorry neobrain :-P
2013-03-11 00:47:43 +01:00
Glenn Rice
e160218394
Update pot file for recent string changes in the code.
2013-03-10 08:57:16 -05:00
Glenn Rice
91a4c9d899
Update translations from transifex.
...
Also add the transifix client configuration directory to gitignore.
2013-03-10 08:55:52 -05:00
Rachel Bryk
9a3633924d
Dolphin needs to be restarted before playing back a wiimote movie, so let's suggest that instead of giving an unhelpful error message.
2013-03-09 02:44:24 -05:00
Rachel Bryk
13a64e992d
Fix a typo.
2013-03-08 22:47:56 -05:00
Rachel Bryk
723371e022
Wow, I'm dumb. Fix mismatched set/get.
2013-03-08 20:06:04 -05:00
Ryan Houdek
f6d45ea461
Fix a potential issue when someone has a CPU core that isn't available on that host set in the INI file, it would just fail out. Now it defaults to interpreter.
2013-03-08 10:52:04 -06:00
degasus
2c9c4d0f01
remove syncing on hacked buffer
...
nvidia does wait for their gpu on syncing, so removing it.
But now, we have to recheck it on every plattform
2013-03-08 10:23:27 +01:00
degasus
708b7d57cd
fix wrapping in postprocessing
2013-03-08 09:36:28 +01:00
Ryan Houdek
be217bf096
Add a comment about Qualcomm in load stores.
2013-03-07 20:28:18 -05:00
degasus
607ddc5b3f
experimental postprocessing
2013-03-08 02:09:59 +01:00
degasus
f673e33a7d
fix hotkey osd position
2013-03-07 21:42:40 +01:00
degasus
a6719abab7
mesa doesn't like 0x0 fbo
2013-03-07 21:30:11 +01:00
degasus
7af0838e98
disable ubo for intel/mesa
...
our ubo workaround isn't much better, but not corrupted and much faster (on hd4000) than the ubo one
2013-03-07 21:07:57 +01:00
degasus
a6844d6b9e
move shader error files in dolphin user directory
2013-03-07 20:37:28 +01:00
degasus
2bd7ba76b9
only report errors without debug_glsl
2013-03-07 20:26:56 +01:00
degasus
8b232c7a4d
fix "some" pp shaders ...
2013-03-07 19:51:57 +01:00
degasus
ebb34ced91
postprocessing: only add *.txt shader and sort them
2013-03-07 19:11:50 +01:00
Ryan Houdek
09e5a7ace7
Change all these pp shaders to GLSL.
2013-03-07 10:47:03 -06:00
degasus
1c125f0fb4
add resolution uniform for pp, 16bit uses this for reducing screen resolution (wtf?)
2013-03-07 17:35:27 +01:00
degasus
12e84f918a
Merge branch 'master' into GLSL-master
...
this fix debug build
2013-03-07 17:05:32 +01:00
degasus
800a58f01c
reimplement postprocessing and fix one shader as example
2013-03-07 17:00:11 +01:00
lioncash
279e3c7e14
Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp
2013-03-07 10:59:50 -05:00
Ryan Houdek
f3528277c4
Make sure to mask out the FPU rounding mode correctly. Good spot from LionCash.
2013-03-07 09:52:38 -06:00
skidau
d3e431af9e
Set g_bSignalTokenInterrupt on the main thread. Fixes the random hang in Harry Potter: Prisoner of Azkaban.
2013-03-07 22:16:00 +11:00
degasus
eaa5a77d9e
fix debug build
2013-03-06 20:47:48 +01:00
Ryan Houdek
427a26fcc2
Clean up PPCSTATE_OFF
2013-03-06 13:46:36 -06:00
degasus
5dd502df3b
Merge branch 'master' into GLSL-master
...
the only commit on master is to fix vertexloader, so disable jit for osx
2013-03-06 19:07:15 +01:00
degasus
7158c14d7a
fix vertexloader without jit
2013-03-06 18:58:15 +01:00
degasus
03511d54d6
fix compilation
...
i missed to fix a merge conflict in dx9
2013-03-06 16:17:07 +01:00
degasus
a1c5e90083
Merge branch 'master' into GLSL-master
...
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/CMakeLists.txt
Source/Core/DolphinWX/Src/GLInterface.h
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
degasus
8d5299c20b
Merge branch 'vertex-loader-cleanup'
2013-03-06 14:08:02 +01:00
degasus
10983b0eae
fix VertexManager::GetRemainingIndices
...
the old implementation returns the amound of primitives fit into index buffers
but also gc needs more than one index per primitve
2013-03-06 12:33:02 +01:00
skidau
0f1ef49da1
Used a scheduled event to generate the ARAM DMA interrupt if the DMA is greater than a certain size. Fixes NFS:HP2 GC.
2013-03-06 17:08:40 +11:00
Ryan Houdek
1214bf1359
Add ARM Jit to GUI when built on ARM
2013-03-06 03:25:45 +00:00
Ryan Houdek
d6558e1c31
Make the (V)LDR/(V)STR instructions support negative offsets. This fixes a bug where Arm Jit couldn't load the top 33 FPRs. Also makes it so the core can access all GPRs, FPRs, and SPRs in ppcState. This increases VPS 15-20 on SSBM intro movie on ODROIDX
2013-03-06 01:51:59 +00:00
Jordan Woyak
2095641af0
OK, seriously, buildfix. I shouldn't even have commit access!
2013-03-05 16:17:45 -06:00
Jordan Woyak
b34991c4c3
Buildfix for real.
2013-03-05 16:08:26 -06:00
Jordan Woyak
fe3a54d7fd
Buildfix!
2013-03-05 15:48:57 -06:00
Jordan Woyak
10d57a3402
Use standard binary multiple unit symbols for game size display.
...
Use integer math for the calculation as we cannot rely on floats for something as important as game size display!
2013-03-05 14:58:30 -06:00
degasus
a2bb7d5766
initialize bSupportsDualSourceBlend only in renderer
2013-03-05 18:35:30 +01:00
degasus
5534d7e8c3
Revert "remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing"
...
This reverts commit 025f8d342f
.
OSX may wait forever, so fix osx freeze
2013-03-05 16:51:09 +01:00
degasus
d19bc15d26
fix glsl140 workaround
2013-03-05 15:24:10 +01:00
degasus
4714e4f99c
fix agl
2013-03-05 15:17:00 +01:00
Ryan Houdek
240238308c
Disable SSE2 check in the GUI when building ARM.
2013-03-05 14:03:01 +00:00