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
88cb11ba0a
I'm confused at why SHIFT-JIS was being used here.
2013-03-02 20:42:48 -06:00
e183711d74
wxString conversion cleanup.
2013-03-02 20:34:53 -06:00
6c8adf6130
Eliminate the wstring game name.
...
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.
Non-windows OSes temporarily broken.
2013-03-02 20:00:36 -06:00
2b1af36900
Merge branch 'master' into windows-unicode
2013-03-02 15:33:32 -06:00
643f18d28b
Added direct GameCube controller commands to the Serial Interface emulation. Fixes the controls in MaxPlay Classic Games Volume 1 and the Action Replay disc.
2013-03-02 22:35:10 +11:00
2356e5c0e7
Eliminate some baseless restrictions in PointerWrap, mainly vector<string> not working.
2013-03-02 03:32:30 -06:00
5bb6ac8164
Increased the FIFO buffer size to 2MB from 1MB. Fixes Killer 7's Angel boss.
...
Fixes issue 5415.
2013-03-02 16:18:55 +11:00
e079d24912
Kill wstring version of game description.
2013-03-01 22:45:10 -06:00
3874b46a93
Used an immediate GenerateDSPInterrupt when transferring data from ARAM to MRAM and a scheduled DSP interrupt when transferring data from MRAM to ARAM.
...
Changed the maximum timeslice back to 20000 as it was causing slowdown.
2013-03-02 12:37:55 +11:00
008fdc7310
Merge branch 'perfqueries'.
...
Adds support for PE performance metrics.
Used in Super Mario Sunshine's "Scrubbing Sirena Beach" level to determine when enough goop has been cleaned up to finish the level.
Also used in TimeSplitters: Future Perfect to determine the appearance of flares around light sources (e.g. sun).
OpenGL and D3D11 only. D3D9 support unlikely to be added unless anyone bothers to do the work.
Initial work and D3D11 support by me. Kudos go to Billiard for adding the OpenGL support and reviving development of this branch that way :D
Slightly (~7%) decreases performance when performance metrics are used (and only then).
Fixes issue 1498.
Fixes issue 5368.
2013-03-02 00:17:37 +01:00
cb1d21c032
PerfQueries: Fix an integer overflow.
2013-03-01 23:57:56 +01:00
d1acb0a937
OGL: Fix perf metrics being overcounted when using a non-native internal resolution.
2013-03-01 23:12:41 +01:00
4058b4c38a
Add documentation to PerfQueryBase interface.
...
Remove the config field for perf queries (wasn't used for the new interface anyway).
Few other cleanups.
2013-03-01 23:02:11 +01:00
5a7bb2abfa
D3D11: Port perf queries code to the PerfQueryBase interface.
...
Remove deprecated PerfQuery methods from RenderBase.
Windows build fix.
2013-03-01 19:30:37 +01:00
ef7083d78c
also don't cleanup efb copys on efb2ram
...
these may be upscaled and this high res textures would be lost
2013-03-01 11:31:52 +01:00
4c6bbec600
Changed the maximum slice length to 1000 from 20000. This makes the emulator check external exceptions more regularly. 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. Fixes a hang in Mario Super Baseball.
Fixes issue 5825.
Fixes issue 5096.
2013-03-01 20:23:55 +11:00
73da6f4f3f
Merge branch 'master' into FIFO-BP
...
# By Jordan Woyak (46) and others
# Via Jordan Woyak (2) and others
* master: (70 commits)
Fixes two memory leaks, one is pretty bad for OSX. Yell at pauldachz if this doesn't work. Or... say thanks.
Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
Make ARMJit core default CPU core on ARM architecture
Fix a StringUtil regression from the arm-noglsl merge
Small improvement to cmpli/cmpi in ARMJit.
Merge latest ArmEmitter changes from ppsspp while we're at it.
Ah. I blame vim on this typo entirely.
Add disabled code for authenticating wiimotes on Windows.
Add the missing FPR cache
Buildfix.
Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
Abort loading states from incompatible graphics backends.
ARM Support without GLSL
Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
Begin implementing save states to video software. Kind of works, sometimes.
Make error message for loading save state with wrong dsp engine shorter.
Abort load state if it uses a different dsp engine, instead of crashing.
Update the gameini of F-zero. Efb to Ram is no longer the default choice.
fix last commit by neobrain
...
Conflicts:
Source/Core/VideoCommon/Src/Fifo.cpp
2013-03-01 20:12:56 +11:00
a2d08d6740
Fix Dolphin starting only once then crashing at startup
2013-03-01 10:11:08 +01:00
99cf57eb39
Fixes two memory leaks, one is pretty bad for OSX.
...
Yell at pauldachz if this doesn't work.
Or... say thanks.
2013-03-01 19:21:34 +13:00
b0630790c1
It's 2013! Why can't I use C++11 yet!?
2013-02-28 19:42:29 -06:00
dea1e2827d
Open std::fstream in a unicode-safe manner.
2013-02-28 19:33:39 -06:00
7a04ec6f92
Implemented proper timing for the sample counter in the AudioInterface, removing the previous hack.
...
Cleaned up some of the audio streaming code.
2013-03-01 11:51:11 +11:00
b94f65b666
Remove two incorrect lines. How did those even get there?!
2013-03-01 01:37:47 +01:00
cbf5efe191
Some cleanups.
...
PE perf metrics officially declared unsupported for the D3D9 project (out of pure laziness, anyone who cares can implement them :P).
2013-03-01 01:31:57 +01:00
1c9860246c
Build fixes for everyone!
2013-03-01 01:14:10 +01:00
d0dbcc6369
VideoSoftware: Cleanup PE perf metrics; returning the proper value now.
2013-03-01 01:08:43 +01:00
7682ed22c6
Merge branch 'master' into perfqueries.
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
2013-03-01 01:07:34 +01:00
5c4a130688
Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
2013-03-01 10:28:42 +11:00
bc15919e2e
Make ARMJit core default CPU core on ARM architecture
2013-02-28 16:15:32 -06:00
0c16489c39
Merge branch 'VideoSoftware-savestates'
2013-02-28 13:36:29 -05:00
0399959c39
Skipped the EE check if there is a CP interrupt pending.
...
Fixes issue 4336.
2013-03-01 00:59:38 +11:00
07539b9a3f
Fix a StringUtil regression from the arm-noglsl merge
...
Fixes issue 6048. Thanks to Starscream for locating the regression.
2013-02-28 13:12:35 +01:00
95558cdc69
Buildfix.
2013-02-28 03:11:10 -06:00
03ec9a2e08
Kill some unnecessary c_str and use StrToWxStr in a few places that I missed.
2013-02-28 02:40:03 -06:00
56f09d3b91
Attempt to be consistent with conversions between std::string and wxString.
2013-02-28 02:30:05 -06:00
e82d976d2f
Buildfix for non-legacy OSes.
2013-02-27 20:55:19 -06:00
6f87611767
Fix "Core" to build with "Unicode".
2013-02-27 20:30:57 -06:00
536c110b31
Fix "DiscIO" to build with "Unicode".
2013-02-27 20:04:07 -06:00
65683ebc64
Hopefully fix all filename handling to support Unicode.
2013-02-27 20:03:06 -06:00
69f7671ee8
Fix "Common" to build with "Unicode" project setting.
2013-02-27 19:19:38 -06:00
ea75577278
Use the new UTF-16 conversion function in two places.
2013-02-27 18:02:07 -06:00
0ea458b4dc
Add functions for converting between UTF-8/16.
2013-02-27 18:00:42 -06:00
9ff704f202
Small improvement to cmpli/cmpi in ARMJit.
2013-02-27 15:17:23 -06:00
f1d727cf13
Merge latest ArmEmitter changes from ppsspp while we're at it.
2013-02-27 11:53:24 -06:00
8c779bb242
Ah. I blame vim on this typo entirely.
2013-02-27 10:26:32 -06:00
1b8d044543
clear cg from project files
2013-02-27 10:55:25 +01:00
6b80e6f83c
Tweak Vertex/Index buffer handling a bit.
2013-02-27 01:57:02 -06:00
e435851e7a
Add disabled code for authenticating wiimotes on Windows.
2013-02-26 21:13:35 -06:00
692e39d1bb
Merge branch 'arm-noglsl'
2013-02-27 02:22:08 +00:00
be7643cd2d
Add the missing FPR cache
2013-02-27 02:15:32 +00:00
a680d17eef
Buildfix.
2013-02-26 19:59:33 -06:00
f1c990069c
Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
2013-02-26 20:47:48 -05:00
46f5c19c6d
Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
2013-02-26 18:52:38 -05:00
08fe3c213a
Abort loading states from incompatible graphics backends.
2013-02-26 18:28:56 -05:00
ae481068cd
cleanup ogl extension osd
2013-02-26 23:36:22 +01:00
a650ae8c7b
workaround for base vertex. damn old nvidia driver
2013-02-26 23:15:55 +01:00
025f8d342f
remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing
2013-02-26 21:48:35 +01:00
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
9bc8d6e02b
make samplercache global and call constructor/destructor
2013-02-26 18:30:13 +01:00
4883fa268f
Split VideoBackend::Cleanup from Shutdown.
...
First is called from ogl/d3d thread, second is called from emulation thread (x11...)
2013-02-26 16:42:32 +01:00
90ff648d00
shader cache based by git revision
2013-02-26 10:48:19 +01:00
8b7141d3de
Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer."
...
This reverts commit 380f22ca0e
2013-02-26 08:57:35 +01:00
e69c58ee89
Removed the disc seek times for GC games and removed the disc speed option on Wii games.
...
Checked for external exceptions only in mtmsr.
Fixes issue 5545.
2013-02-26 18:10:02 +11:00
db838e759b
Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
2013-02-26 01:36:24 -05:00
380f22ca0e
Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer.
...
This reverts commit 52dacaa3e3
2013-02-25 20:52:30 -06:00
415a2f17c9
Begin implementing save states to video software. Kind of works, sometimes.
2013-02-25 20:05:02 -05:00
bd14ad5300
Merge branch 'master' into vertex-loader-cleanup
2013-02-25 17:55:44 -06:00
46adbfa9ed
Merge branch 'real-wiimote-scanning'
2013-02-25 17:33:34 -06:00
e5c53e371f
Make error message for loading save state with wrong dsp engine shorter.
2013-02-25 18:12:48 -05:00
a450ba4420
Abort load state if it uses a different dsp engine, instead of crashing.
2013-02-25 15:58:12 -05:00
d173d646de
fix last commit by neobrain
2013-02-25 16:11:24 +01:00
73a0bdd379
Build fixing.
2013-02-25 12:42:52 +00:00
1141af64f6
TextureCacheBase: Do not assume EFB copies can safely be deleted when we think they're "unused".
...
Fixes issue 6040.
2013-02-25 12:36:50 +00:00
6b2804e296
Possible crashfix for OSX.
2013-02-24 22:29:33 -06:00
c86b892f95
Revert "remove numTexGens=7 hack. only cg wasn't able to handle more then 8 texcoords"
...
This reverts commit 4653adecf1
2013-02-24 20:51:44 +01:00
dc98ce5922
Added the addeo instruction to the JIT tables. Fixes Inkub (WiiWare).
2013-02-24 23:05:12 +11:00
6b28b3929a
Delayed the interrupts in the EXI Channel.
...
Fixes issue 5580.
2013-02-24 21:32:14 +11:00
40b65fdc04
Merge aram-dma-fixes (r76a13604ef49b522281af75675f044d59a74e871)
2013-02-24 17:10:33 +11:00
52dacaa3e3
Make the posmtx vertex attribute an int instead of converting to and from a float.
2013-02-23 20:54:30 -06:00
ae566d6b3c
Merge branch 'aram-dma-fixes' into FIFO-BP
...
# By Pierre Bourdon
# Via Pierre Bourdon
* aram-dma-fixes:
Simulate a small delay on GC Memcard operations
2013-02-24 00:11:11 +11:00
ba979582e2
Makes the "No banner" banner image theme-able. Current "sexy X" banner included as part of "Boomy" theme.
...
Fixes issue 6023.
2013-02-22 15:30:07 -05:00
0a05fcade4
fix glsl compilation error on intel
2013-02-22 12:19:52 +01:00
d9adc26332
real Star Fox fix
2013-02-22 12:14:39 +01:00
242d960781
increase buffer size
...
32M UBO, 16M Vertex, 2M Index
2013-02-22 10:25:38 +01:00
86935ab4fd
forceinline IndexGenerator::WriteTriangle
2013-02-22 03:22:20 -06:00
e270c8b153
fix Star Fox
2013-02-22 09:54:19 +01:00
d3f1bb93f2
Use DataWrite in a few more places.
2013-02-22 02:19:59 -06:00
db1be085c2
VertexManager cleanup
2013-02-22 01:41:52 -06:00
21bd5be753
Buffer size changes.
2013-02-21 23:12:53 -06:00
d76ca57837
Fixed a JIT timing bug that prevented Eternal Darkness from booting in Single Core mode.
2013-02-22 15:13:49 +11:00
f16dcfe6f6
Remove logic from IndexGenerator which does not seem to match that of Video Software.
2013-02-21 21:02:49 -06:00
368c78dd5c
IndexGenerator cleanup.
2013-02-21 19:11:07 -06:00
9332775b68
default upload method for nvidia is buffersubdata
2013-02-21 21:59:40 +01:00
677c6229ad
Experimental VertexLoader cleanup!
2013-02-21 14:41:06 -06:00
a92c93f870
Automate some calculations, with templates!
2013-02-21 13:29:05 -06:00
degasus