6962929356
GLSL: fix nfs-hp2
2013-03-15 23:32:01 +01:00
e1a081ad2d
Merge branch 'GLSL-master'
...
Merge an endless story. The branch name is a lie, it was started as glsl, but now it is a complete reworked opengl3 backend.
It just began with simple changes which aren't supported on osx.
They either support ogl2 OR ogl3 core, but mixing isn't allowed.
As the branch name says, the vicious circle starts with GLSL, but just implementing one wasn't possible either:
- OSX supports only GLSL100 which doesn't support our shaders.
- Vertex Array Objects are needed for ogl3, but not supported on ogl2
- immediate mode isn't supported any more, so we must implement vertex buffers
- uniform buffers are recommended as else we would need tons glUniform
- postprocessing shaders have to be converted to glsl
- lots of smaller outdated issues and bug fixes :-)
Thanks at all for testing and at Sonic for converting all of our shaders to glsl130
And sorry for all upcoming bugs...
2013-03-15 22:49:26 +01:00
8767b30f75
My OCD will not stand for this.
2013-03-15 15:42:59 -04:00
363d0be9f9
Derp. No Windows to test compile on.
2013-03-15 11:29:12 -05:00
8c1091a21f
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
2013-03-15 11:19:52 -05:00
d63d7fde9e
So much more readable now!
2013-03-15 11:45:43 -04:00
e877b5019b
PixelShaderManager: Reload fog range adjustment shader constants upon viewport change.
...
Fixes issue 5618.
2013-03-15 15:08:51 +01:00
def578fea6
Fix checks for preventing the main and render windows from spawning off screen.
2013-03-15 09:19:39 -04:00
afb6f9127a
Corrected a typo.
2013-03-15 19:32:47 +11:00
84119a966b
Revert "remove wx from agl"
...
This reverts commit e63a5d8529
2013-03-15 02:40:08 +01:00
203b1748a3
PixelShaderGen: Force depth textures to be emulated when the result is needed for fog calculation.
2013-03-15 01:01:00 +01:00
1f73651a7a
VideoSoftware: Do not clear the depth buffer on EFB copy clears when depth writing is disabled.
2013-03-14 23:59:52 +01:00
d6c7e7d652
Let's do this version check again.
2013-03-14 15:46:27 -05:00
db1fc9019b
Add a OSX version check to GLSL so if anyone running < OSX 10.7 gets a message instead of crashing when running the game. Turn off DEBUG_GLSL.
2013-03-14 15:25:41 -05:00
e6c6053fcc
Beginning of VFP cleanup. Will finish when I have the hardware in front of me.
2013-03-14 10:45:26 -05:00
b4830be9bc
Actually set the bIDIVa value in the ARM CPUDetect.
2013-03-14 08:48:01 -05:00
eaebebc33d
Prevent the render window from spawning off screen.
...
Fixes issue 6063.
2013-03-14 05:28:02 -04:00
e63a5d8529
remove wx from agl
2013-03-14 09:52:13 +01:00
a0fdcaced8
Removes the redundant window on OSX
2013-03-13 21:34:52 -05:00
c93f7760ce
Really clean up all the emitter loadstores on ARM. If a ARM device supports VFPv4, then it supports IDIVA, so handle that in CPUDetect.
2013-03-14 01:50:38 +00:00
202e2fa5c8
Add a new WriteNewStoreOp emitter function for beginning of rewrite of the Arm Emitter LoadStores. Will finish when I have the hardware in front of me to test on.
2013-03-13 14:08:54 -05:00
85eab1d262
Used the scheduler to generate the interrupt for IPC. Fixes the ES_LAUNCH games.
2013-03-13 22:23:59 +11:00
0b34457a8e
All the cool kids hard code string lengths.
...
Fixes issue 6090.
2013-03-13 07:04:53 -04:00
e73cc858bc
Allow playing movies from command line. Also remove some unneeded code.
2013-03-13 01:37:35 -04:00
2c84c32ddc
decrease d3d vertex buffer size
2013-03-12 17:48:20 +01:00
382be2aabd
Merge branch 'master' into GLSL-master
...
Conflicts:
.gitignore
2013-03-12 11:28:56 +01:00
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
8406d9972d
Fix JIT from rebasing on PPSSPP ArmEmitter.
2013-03-12 02:35:29 +00:00
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
e1ca002937
osx: only use accelerated backends
2013-03-11 16:36:07 +01:00
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
13a64e992d
Fix a typo.
2013-03-08 22:47:56 -05:00
723371e022
Wow, I'm dumb. Fix mismatched set/get.
2013-03-08 20:06:04 -05:00
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
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
708b7d57cd
fix wrapping in postprocessing
2013-03-08 09:36:28 +01:00
be217bf096
Add a comment about Qualcomm in load stores.
2013-03-07 20:28:18 -05:00
f673e33a7d
fix hotkey osd position
2013-03-07 21:42:40 +01:00
a6719abab7
mesa doesn't like 0x0 fbo
2013-03-07 21:30:11 +01:00
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
a6844d6b9e
move shader error files in dolphin user directory
2013-03-07 20:37:28 +01:00
2bd7ba76b9
only report errors without debug_glsl
2013-03-07 20:26:56 +01:00
8b232c7a4d
fix "some" pp shaders ...
2013-03-07 19:51:57 +01:00
ebb34ced91
postprocessing: only add *.txt shader and sort them
2013-03-07 19:11:50 +01:00
1c125f0fb4
add resolution uniform for pp, 16bit uses this for reducing screen resolution (wtf?)
2013-03-07 17:35:27 +01:00
12e84f918a
Merge branch 'master' into GLSL-master
...
this fix debug build
2013-03-07 17:05:32 +01:00
800a58f01c
reimplement postprocessing and fix one shader as example
2013-03-07 17:00:11 +01:00
279e3c7e14
Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp
2013-03-07 10:59:50 -05:00
f3528277c4
Make sure to mask out the FPU rounding mode correctly. Good spot from LionCash.
2013-03-07 09:52:38 -06:00
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
eaa5a77d9e
fix debug build
2013-03-06 20:47:48 +01:00
427a26fcc2
Clean up PPCSTATE_OFF
2013-03-06 13:46:36 -06:00
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
7158c14d7a
fix vertexloader without jit
2013-03-06 18:58:15 +01:00
03511d54d6
fix compilation
...
i missed to fix a merge conflict in dx9
2013-03-06 16:17:07 +01:00
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
8d5299c20b
Merge branch 'vertex-loader-cleanup'
2013-03-06 14:08:02 +01:00
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
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
1214bf1359
Add ARM Jit to GUI when built on ARM
2013-03-06 03:25:45 +00:00
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
2095641af0
OK, seriously, buildfix. I shouldn't even have commit access!
2013-03-05 16:17:45 -06:00
b34991c4c3
Buildfix for real.
2013-03-05 16:08:26 -06:00
fe3a54d7fd
Buildfix!
2013-03-05 15:48:57 -06:00
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
a2bb7d5766
initialize bSupportsDualSourceBlend only in renderer
2013-03-05 18:35:30 +01:00
5534d7e8c3
Revert "remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing"
...
This reverts commit 025f8d342f
2013-03-05 16:51:09 +01:00
d19bc15d26
fix glsl140 workaround
2013-03-05 15:24:10 +01:00
4714e4f99c
fix agl
2013-03-05 15:17:00 +01:00
240238308c
Disable SSE2 check in the GUI when building ARM.
2013-03-05 14:03:01 +00:00
33a13b1a37
Fixed issue 5270. Don't ask me how, I just clean up code and then it works! I think it was int overflow.
2013-03-05 00:35:24 -06:00
3ac7ee4623
Fix compiling Dolphin on devices that provide crazy GLES drivers
2013-03-05 03:53:25 +00:00
b7db96e2e5
Merge branch 'hle-fs-cleanup'
2013-03-04 19:02:41 -06:00
f3f89e1d00
Merge branch 'master' into vertex-loader-cleanup
...
Conflicts:
Source/Core/Common/Src/CommonFuncs.h
Source/Core/VideoCommon/Src/VertexLoader.cpp
2013-03-04 15:47:56 -06:00
bf58c70e9b
Move copy-pasted code into function.
2013-03-04 15:35:29 -06:00
642eab92bc
disable per pixel depth if depth textures aren't used
2013-03-04 20:12:58 +01:00
efcfc5c014
workaround for GLEW_AMD_pinned_memory and older glew versions
2013-03-04 12:40:23 +01:00
e4f8d7b4c8
fix debug build
2013-03-04 10:20:55 +01:00
5d47fd1dde
Remove HLE_IPC_CreateVirtualFATFilesystem as it no longer takes 3 minutes to LLE like the comment says.
2013-03-04 02:39:05 -06:00
6d50bd127d
Remove hack that seems to be no longer needed.
2013-03-04 02:22:11 -06:00
efcb2abe9b
Don't open/close file for every file operation.
2013-03-04 02:21:58 -06:00
04a33b177a
Make seek mode 2 (offset from end of file) make sense. I doubt any games use this.
2013-03-04 01:42:38 -06:00
0efe6c2124
GET_ATTR should not be returning the real filepath that we built.
2013-03-04 01:42:38 -06:00
0041ec618c
Don't null-terminate some random std::string.
2013-03-03 20:16:01 -06:00
814c2ffdfd
Fix some leaking file handles and buildfix probably.
2013-03-03 19:20:35 -06:00
989f0663eb
Make "Crypto" file opening unicode-safe on Windows.
2013-03-03 19:14:13 -06:00
6b2818199c
Fix WAD volume name extracting.
2013-03-03 19:00:29 -06:00
bdc96342ba
More string conversion cleanup.
2013-03-03 18:40:50 -06:00
6026b29844
Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases.
2013-03-03 18:34:03 -06:00
a30636cb88
Buildfix.
2013-03-03 18:00:48 -06:00
ae14578bc5
Eliminate some netplay gamelist ugliness.
2013-03-03 17:56:40 -06:00
c07b8a6e37
Fix more of what I broke.
2013-03-03 17:08:41 -06:00
b1a2915304
Merge branch 'master' into windows-unicode
2013-03-03 15:05:10 -06:00
cedfa452b4
Windows: Open wiimotes with the FILE_SHARE_WRITE flag like before.
...
This should fix issues introduced by real-wiimote-scanning.
2013-03-03 14:34:59 -06:00
61b01474fa
Bumped up the disc transfer speed enough to prevent audio stuttering in Gauntlet: Dark Legacy.
...
Fixes issue 4644.
2013-03-03 23:35:07 +11:00
fad2b65d76
More wxString conversion cleanup.
2013-03-03 02:30:45 -06:00
aeb4fc9846
Fix what I broke.
2013-03-03 02:12:24 -06:00
a01f793f59
Fix ARM build.
2013-03-03 07:37:22 +00:00
ed90feb2b4
Kill warning.
2013-03-02 23:00:14 -06:00
6dbd80d73e
Reverted the audio streaming tweak from r7a04ec6f9220dd66147c86baaebc2f9e05d65ead as it was causing audio clipping in some Wii games like Fire Emblem: Radiant Dawn.
2013-03-03 15:20:15 +11:00
degasus