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
7987d6babb
Use templates for 8+16 bit indexed versions of SSSE3/SSE4 TextCoord reading.
2013-02-21 12:42:09 -06:00
bed29f843f
fix spelling
2013-02-21 18:29:17 +01:00
40e17b4cb8
add option for hacked upload and disable it by default
2013-02-21 18:18:44 +01:00
d0e8217714
remove intel pixel shader hack
...
did not work correctly and made warnings on dx11
2013-02-21 17:44:56 +01:00
c7f4d6b9ac
wrapper for s_pCurBufferPointer
2013-02-21 13:45:48 +01:00
4b4dce1bd9
build fix
2013-02-21 13:00:19 +01:00
76e6085e31
consistently usage of buffer pointers
2013-02-21 12:36:29 +01:00
a849bb5242
Merge branch 'vertexloader_cleanup' into vertex-loader-cleanup
...
Conflicts:
Source/Core/VideoCommon/Src/VertexLoader_TextCoord.cpp
2013-02-21 12:18:50 +01:00
66d0c1c301
small cleanups of s_pCurBufferPointer
2013-02-21 11:45:29 +01:00
0d33e20026
bbox: replace s_pCurBufferPointer with locale buffer, so it can be read without read from the writeonly buffer
2013-02-21 11:41:14 +01:00
7a89faf13f
converting the last vertices again instead of copying from buffer on buffer split
...
for mapping, this buffer must be write only, so we cannot copy anthing.
converting again needs more cpu, but should happen rarely
2013-02-21 11:36:10 +01:00
dc776a19a0
Cleanup VertexLoader's Color functions a bit.
2013-02-21 02:49:17 -06:00
660fc12927
Cleanup Position loader functions.
2013-02-21 02:19:06 -06:00
5efdcef34a
No longer have the signed/unsigned hack I guess.
2013-02-21 00:49:47 -06:00
3938d3713b
Fix what I broke.
2013-02-21 00:40:22 -06:00
5b63472ad7
Templatify Normal Loader functions.
2013-02-21 00:10:06 -06:00
5e78f8a176
Templatify TextCord Loader functions.
2013-02-20 20:43:53 -06:00
8f256237a3
Templatify DataReader a bit.
2013-02-20 20:21:25 -06:00
6a13a4e5ed
Add template "swap" function to CommonFuncs.
2013-02-20 20:20:53 -06:00
e9232280c4
Fix OSX!
2013-02-20 17:35:41 -06:00
f3e91bc10d
Hopefully kill a stupid warning on Windows.
2013-02-20 17:30:34 -06:00
e7c93b8ac3
Minor sampler cache cleanup.
2013-02-20 17:15:10 -06:00
b7fae1febb
Fix my DX11 texture-related failure..
...
Fixes issue 6026. (probably)
2013-02-20 14:18:21 -06:00
36f2082a5f
Made vertex loading take constant time. Fixes a hang in Gladius.
2013-02-20 23:38:25 +11:00
6e6d8af6dd
Revert "Don't load level 0 twice for 1-level textures in DX11." and fix it properly.
...
All backend TextureCaches now load level 0 in CreateTexture.
This reverts commit 294cb165ba
2013-02-20 05:42:22 -06:00
eae20b77a8
Remove some unneeded sampler-related calls in BPStructs.
2013-02-20 02:01:54 -06:00
294cb165ba
Don't load level 0 twice for 1-level textures in DX11.
2013-02-19 22:39:28 -06:00
55c2a01744
Check for sampler object support, just to be nice.
2013-02-19 21:24:08 -06:00
f2647a1216
Implement OGL sampler cache. Allows binding a texture multiple times with different parameters. Also possibly gives a very small speed improvement.
2013-02-19 21:18:53 -06:00
d93e57ff22
revert b5fe39b8c7 "fix texture parameters"
...
these parameters are really floats. I was just wrong
2013-02-19 22:20:39 +01:00
b5fe39b8c7
fix texture parameters
2013-02-19 17:28:46 +01:00
50f4bf114e
Revert "map_orphan_and_risk - next try for upload method"
...
This reverts commit 17747fcfb8
2013-02-19 15:51:48 +01:00
0f2ee45d96
remove ati workaroung for mipmap creation
...
isn't needed any more by merging mapmap_fixes
2013-02-19 15:40:34 +01:00
351c741906
Merge branch 'master' into FIFO-BP
...
# By Jordan Woyak (9) and others
* master:
Fixed a buffer overflow in the OpenAL buffer.
TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs.
WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation.
Some cleanup of CWII_IPC_HLE_Device_FileIO: The real file was never kept open for longer than a single operation so there was no point in dealing with it in DoState. Saving the real path in the savestate was also probably a bad idea. Savestates should be a bit more portable now.
Removing destination on rename when source isn't present doesn't make sense. IOCTL_RENAME_FILE still might not be totally correct.
Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin.
Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time.
Fix a memleak. Probably/maybe improve USBGecko performance.
Remove the core count from the cpu info OSD message. It was often wrong and not rather important.
Use omp_get_num_procs to set the number of OpenMP threads rather than our core count detection.
Bulk send TCP data to the client with the emulated USB Gecko.
Added the ability to reverse the direction of the force feedback by allowing negative range values.
Changes/cleanup to TextureCache::Load and other mipmap related code. The significant change is what is now line 520 of TextureCacheBase.cpp: ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1) to TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);
2013-02-19 23:19:29 +11:00
17747fcfb8
map_orphan_and_risk - next try for upload method
...
should work around nvidia600 driver issue which will flush gpu on syncing
also increase buffer size by orphaning
2013-02-19 13:18:48 +01:00
718a1b5ded
Fixed a buffer overflow in the OpenAL buffer.
2013-02-19 23:18:13 +11:00
fed574d08b
solve merge conflict
2013-02-18 18:55:42 +01:00
a629dea4dc
Merge branch 'master' into GLSL-master
...
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Source/Core/DolphinWX/Src/GLInterface/WX.h
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.h
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
19ab5bf50d
TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs.
2013-02-18 17:14:56 +01:00
0f617183a8
Add a possible TODO.
...
Dunno if the hardware behaves like this, but it likely does.
2013-02-18 14:54:24 +00:00
4653adecf1
remove numTexGens=7 hack. only cg wasn't able to handle more then 8 texcoords
2013-02-17 22:37:00 +01:00
bef24b5c6b
new format for gl extensions
2013-02-17 21:41:00 +01:00
d0ea94a2aa
WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation.
2013-02-17 13:52:04 -06:00
fa9aafeed8
Some cleanup of CWII_IPC_HLE_Device_FileIO:
...
The real file was never kept open for longer than a single operation so there was no point in dealing with it in DoState.
Saving the real path in the savestate was also probably a bad idea. Savestates should be a bit more portable now.
2013-02-17 13:37:01 -06:00
0cdd4434b9
Removing destination on rename when source isn't present doesn't make sense.
...
IOCTL_RENAME_FILE still might not be totally correct.
Fixes issue 5440.
2013-02-17 12:51:12 -06:00
bf4be1d8d1
Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin.
2013-02-17 01:57:25 -06:00
3330842505
Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time.
2013-02-17 01:33:22 -06:00
9ac2fbb0a5
Fix a memleak. Probably/maybe improve USBGecko performance.
2013-02-17 00:19:42 -06:00
206fdde933
Remove the core count from the cpu info OSD message. It was often wrong and not rather important.
2013-02-16 23:48:20 -06:00
537d5ea942
Use omp_get_num_procs to set the number of OpenMP threads rather than our core count detection.
2013-02-16 23:48:20 -06:00
123035a192
Bulk send TCP data to the client with the emulated USB Gecko.
...
Fixes issue 6006.
2013-02-17 15:27:15 +11:00
1792a9d27b
Added the ability to reverse the direction of the force feedback by allowing negative range values.
...
Fixes issue 5981.
2013-02-17 15:03:10 +11:00
53aec6c476
Fix OGL perf queries and make them not slow!
2013-02-16 19:30:24 -06:00
0e2c3f3483
Increased the cycle time of the vertex command. Fixes "Speed Challenge: Jacques Villeneuve's Racing Vision".
2013-02-16 22:54:10 +11:00
45efced280
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.
2013-02-16 18:30:20 +11:00
d994e56b60
Changes/cleanup to TextureCache::Load and other mipmap related code.
...
The significant change is what is now line 520 of TextureCacheBase.cpp:
((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1)
to
TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);
Fixes issue 5328.
Fixes issue 5461.
2013-02-15 22:56:29 -06:00
0c882cca66
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.
2013-02-16 13:54:58 +11:00
9bff8e00c8
Added preliminary support to synchronise the timing of the CPU and GPU threads. A new option has been added to the game properties for this purpose. This option may help with random freezes in Dual Core mode.
...
Fixes Gladius and Baten Kaitos: Eternal Wings and the Lost Ocean
Fixes issue 5150.
2013-02-16 12:51:09 +11:00
51795d8811
Merge branch 'master' into FIFO-BP
...
# By Jordan Woyak (24) and others
# Via Jordan Woyak (3) and others
* master: (66 commits)
Reduce some DI command delays. Fix DKCR hanging with DSP HLE. My other games continue to work.
Video_Software: Fix ZComploc option breaking stuff.
Video_Software: Fix the ZFreeze option doing nothing.
Video_Software: Toggable zfreeze and early_z support for testing.
Fix header guard and definitions not being set to 1
Add the option to turn on only the EGL interface to use desktop OpenGL with it.
Change the ugly "no banner" banner to the sexy "X" from the website.
Fix a crash in the FifoPlayer dialog.
Use different reply delays for various DI commands. Fixes issue 5983.
Revert "[bugfix] DX9::TextureCache: Use max_lod instead of min_lod where necessary."
Fix some potential issues when blending on EFB formats without alpha. Clean up state transition tables.
Disable play and record buttons if an iso was selected, but is later deselected.
Disable start/play recording buttons when no iso is selected.
Only delay DI and fs IPC replies. Fixes issue 5982.
Fix compilation with SDL2. (based on a patch from matthewharveys) Fixes issue 5971.
"Fix" using SDL from externals.
Clean up SDL includes a bit. Maybe fix an SDL2 problem.
Number "unknown" axes in OSX rather than call them all "unk".
Revert "Only delay DI command replies." Fix "Wii Party" again.
Hopefully make wiimote speaker less crappy.
...
2013-02-16 11:10:03 +11:00
5a3435255b
Reduce some DI command delays. Fix DKCR hanging with DSP HLE. My other games continue to work.
2013-02-15 16:02:38 -06:00
6fd96a162f
Video_Software: Fix ZComploc option breaking stuff.
2013-02-15 17:55:16 +01:00
fb0102d441
Video_Software: Fix the ZFreeze option doing nothing.
2013-02-15 17:47:29 +01:00
183ad0c628
Video_Software: Toggable zfreeze and early_z support for testing.
2013-02-15 17:45:33 +01:00
334bd52f2c
NaNs handling in pixel shader
2013-02-15 15:46:31 +01:00
e259343275
fix efb copy shaders
2013-02-15 13:13:45 +01:00
ef90b15f3e
Provide an option to not send speaker data. It can cause rumble lag even when the speaker is muted.
2013-02-15 03:00:31 -06:00
1f20a24a04
Minor changes.
2013-02-14 21:02:41 -06:00
891de52769
Don't need to hang dolphin when searching for wiimote with the refresh button.
...
This code is getting pretty ugly. :/
2013-02-14 19:04:34 -06:00
cda88a8c1e
Random improvements.
2013-02-14 18:43:11 -06:00
306e6b1d80
Turn off continuous scanning by default.
2013-02-14 18:43:11 -06:00
9f4a616f2e
build fix
2013-02-14 19:04:52 +01:00
a0ef58418b
workaround for buggy intel windows driver. revert this as soon as there are newer driver
2013-02-14 18:59:45 +01:00
0325e37bfb
merge glsl headers into one place
2013-02-13 21:34:48 +01:00
e57ff06130
Futile attempts at fixing Windows.
2013-02-13 14:00:15 -06:00
3392562501
rewrite efb copy shader, copied from dx11
2013-02-13 18:01:06 +01:00
21b83b436c
create shader cache directoy
2013-02-13 16:50:56 +01:00
b3675d15dc
enable shader cache again
2013-02-13 16:30:15 +01:00
398b37f371
fix ValidateShaderIDs
2013-02-13 15:16:32 +01:00
bbc292c210
merge Vertex and PixelShaderCache into ProgramShaderCache
...
this is the first step, uniform handling is still missing
2013-02-13 13:12:19 +01:00
77381a1af2
Futile attempts at fixing OS X.
2013-02-12 21:37:47 -06:00
7f305ba822
Fix sloppy connection logic.
2013-02-12 18:59:45 -06:00
12674b3164
Possibly improve real wiimotes on Windows.
2013-02-12 17:01:51 -06:00
818a376bd4
Fix header guard and definitions not being set to 1
2013-02-12 14:11:29 -06:00
1e64c38998
Clean up SDL includes a bit. Maybe fix an SDL2 problem.
...
Conflicts:
Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
2013-02-12 14:02:43 -06:00
46f94203b7
Fix compilation with SDL2. (based on a patch from matthewharveys)
...
Fixes issue 5971.
Conflicts:
Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
2013-02-12 14:00:51 -06:00
da53ca8ee3
"Wait for the wiimote to connect"? I think that's a horrible idea.
2013-02-12 00:19:27 -06:00
a6461ca186
Improve wiimote reconnection on changing wiimote sources.
2013-02-11 23:39:04 -06:00
fa10335c55
Make continuous scanning optional.
2013-02-11 17:58:56 -06:00
f3d25f2cb0
OSX buildfix!
2013-02-11 16:07:01 -06:00
0fb7f65e04
Problems on Windows? Just SLEEP twice as long!
2013-02-11 15:58:23 -06:00
c2d2fb8c7c
Try to improve real wiimotes on Windows.
2013-02-11 15:21:58 -06:00
8923f0e13b
Fix header guard and definitions not being set to 1
2013-02-11 15:06:40 -06:00
b8fd5c0c30
Fix Windows for real!
2013-02-11 05:57:55 -06:00
c267be2682
Hopefully fix windows!
2013-02-11 05:30:51 -06:00
7a053d0f07
buildfix!
2013-02-11 03:50:54 -06:00
05ec90488b
Make real wiimotes not so crappy on Windows hopefully.
2013-02-11 03:39:09 -06:00
f26650e55b
Removed the updating of PC in the Cleanup function. This was causing Metroid Prime to hang.
2013-02-11 08:42:16 +11:00
17c4fcfd90
Removed the updating of PC in GenQuantizedStores() as the generated code is static.
2013-02-10 18:40:50 +11:00
0cafc33eda
Moved the token update to the CPU thread.
2013-02-10 18:24:30 +11:00
056930cac8
Updated PC on a few memory writes that were missed in the FifoBusy branch. Thanks to hk.konpie for the tip.
...
Fixes issue 5993.
2013-02-10 13:33:56 +11:00
1c64b1993d
Change the ugly "no banner" banner to the sexy "X" from the website.
2013-02-09 17:04:41 -06:00
6645bd6fc6
Fix a crash in the FifoPlayer dialog.
2013-02-09 12:39:19 +01:00
5f672baca3
Used Atomic functions to update variables shared between the CPU and GPU threads.
...
Changed the variables from bool to u32 to match the atomic functions.
2013-02-09 17:46:48 +11:00
50c83d614c
More attempts at fixing Windows and OS X.
2013-02-08 21:20:54 -06:00
9bb9286cd3
OSX buildfix!
2013-02-08 16:59:59 -06:00
1f1b4a6992
Hopefully make real wiimotes on OSX less crashy.
2013-02-08 16:54:48 -06:00
a11827cdf0
Use different reply delays for various DI commands.
...
Fixes issue 5983.
2013-02-08 16:27:14 -06:00
1998da867b
OSX fix maybe. (based on jchadwick's patch)
2013-02-08 12:33:45 -06:00
8ce58759e3
Remove some old nonsense.
2013-02-07 23:52:50 -06:00
87bbdbf542
Remove settings stuff that was not actually used anywhere.
2013-02-07 23:23:32 -06:00
026793fa4a
Fixup real wiimote GUI.
2013-02-07 23:17:51 -06:00
3063942dd0
some cleanup
2013-02-07 21:54:23 -06:00
c4df69a342
Merge branch 'master' into real-wiimote-scanning
...
Conflicts:
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
2013-02-07 20:22:06 -06:00
a2ca76ebd9
Buildfix.
2013-02-07 15:16:41 -06:00
57ea09dcc2
Fix BT-less!
2013-02-07 14:46:01 -06:00
95d08db46f
Revert "[bugfix] DX9::TextureCache: Use max_lod instead of min_lod where necessary."
...
This reverts commit 6c8a22de24
2013-02-07 21:45:06 +01:00
9ecfb5e75d
Buildfix for real!
2013-02-07 14:42:50 -06:00
85f25ded4c
Buildfix!
...
Programming for Windows on Linux is hard, OK?
2013-02-07 14:22:45 -06:00
8f5fb7e6f9
Hopefully buildfix Windows. (thanks for the patch, RachelB)
2013-02-07 14:15:47 -06:00
ed0abc9dc5
Merge branch 'mipmap_fixes'.
2013-02-07 20:40:33 +01:00
6870c1fdd5
Fix some potential issues when blending on EFB formats without alpha.
...
Clean up state transition tables.
2013-02-07 18:01:24 +01:00
10567cb23f
always write to uv coords
2013-02-07 13:23:20 +01:00
f079b04a5d
also check for glsl errors on linking, activation GLSL_DEBUG again (slowdown on shader compilation)
2013-02-07 12:47:41 +01:00
9987765b1f
build fix
2013-02-07 10:48:42 +01:00
376a807dea
first try of osx fix, mostly by pauldachz
2013-02-07 10:34:29 +01:00
0ebe35e0ef
Disable play and record buttons if an iso was selected, but is later deselected.
2013-02-07 00:31:57 -05:00
6bc9e7579c
Disable start/play recording buttons when no iso is selected.
2013-02-06 20:56:07 -05:00
dae1226e1b
workaround for division by zero on fog calculation
2013-02-07 02:21:30 +01:00
9cbfddd788
Only delay DI and fs IPC replies.
...
Fixes issue 5982.
2013-02-06 16:52:51 -06:00
ef9d7fb789
Fix compilation with SDL2. (based on a patch from matthewharveys)
...
Fixes issue 5971.
2013-02-05 21:08:52 -06:00
e7a8d3f854
check for GL_ARB_sync, it's in ogl 3.2
2013-02-06 01:05:19 +01:00
708fed92c8
Clean up SDL includes a bit. Maybe fix an SDL2 problem.
2013-02-05 15:34:23 -06:00
f506783c37
Number "unknown" axes in OSX rather than call them all "unk".
2013-02-05 13:51:08 -06:00
ef602fd643
workaround for glGetUniformLocation in efb2ram
2013-02-05 18:22:23 +01:00
76adc77fa6
bigger buffers
2013-02-05 18:01:27 +01:00
937d9e9007
Revert "Only delay DI command replies."
...
Fix "Wii Party" again.
This reverts commit fb5b5e8b63
2013-02-05 02:51:34 -06:00
d0190faded
Hopefully make wiimote speaker less crappy.
2013-02-04 22:11:13 -06:00
bc35764ec2
Fixed issue 5973. (probably)
2013-02-04 21:25:14 -06:00
a455abe00b
Merge branch 'more-ipc-hle-hacks'
...
Fixes issue 5972.
2013-02-04 21:01:46 -06:00
d5ec631337
Make real wiimote speaker not cause massive input delays.
...
Fixes issue 5966.
2013-02-04 20:57:08 -06:00
fb5b5e8b63
Only delay DI command replies.
2013-02-04 19:39:31 -06:00
1d86dafbe2
evil hack: map the buffer once and use this pointer after unmaping
...
This isn't allowed by gl and may _only_ work, if the driver uses cpu bound buffer.
But it may speed up :-)
2013-02-05 00:53:14 +01:00
2ad30958d6
Stuck an IPC HLE Update call in WII_IPCInterface::Write32.
...
While hacky, this seems to fix various problems without increasing IPC HLE freq to infinity.
Thanks to Aristar for helping test.
Increase IPC command reply delay to 1/100th of a second. (fixes DKCR hanging)
2013-02-04 17:41:10 -06:00
f677b8cba3
update to glew1.9, win binaries also from official release
2013-02-04 21:11:12 +01:00
2108529120
also align the size of buffers for pinned memory
2013-02-04 20:48:28 +01:00
2c8c8db731
Used AtomicStore to write to the signal interrupts.
2013-02-03 23:52:18 +11:00
03d9cca2fe
Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds.
2013-02-03 19:02:46 +11:00
9a4e9da7c2
Set the token and finish interrupt signal from the video thread. This fixes the inconsistent state caused by lag from the scheduler. Fixes Rayman 3: Hoodlum Havoc and Shamu's Deep Sea Adventures.
...
Fixes issue 5401.
Fixes issue 5589.
2013-02-03 18:05:46 +11:00
ca46a34dde
Merge branch 'ipc-hle-hacks'
...
Thanks skid_au for testing and helping think of the solution!
Fixes Issue 4608.
Fixes Issue 5050.
Fixes Issue 5103.
2013-02-02 12:54:22 -06:00
e3c6c6dd69
Increase IPC HLE freq a bit for DKCR.
2013-02-02 12:52:12 -06:00
6e0b0192a8
correct spelling of align
2013-02-02 19:39:26 +01:00
0c7aa4ff4f
build fix
2013-02-02 19:32:40 +01:00
6e20af9ee9
align memory, use pinned memory if available
2013-02-02 19:26:29 +01:00
5c08df00b2
Re-increase max ACL queue size to 100. Better than possibly dropping a packet.
...
Reduced IPC update freq some.
Removed some other nonsense.
2013-02-02 03:55:33 -06:00
867bfaa696
Changed cmdidle to match the isGpuReadingData flag. Fixes the random freezes in The Last Story.
2013-02-02 20:50:40 +11:00
286392af9d
Reduce ACL max queue size back to 10. Increase IPC_HLE freq to 8 KHz to compensate.
2013-02-01 23:44:17 -06:00
15936cb995
Change copy_n to copy and update the save state version because I forgot.
2013-02-01 23:27:49 -06:00
degasus