ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,382 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

8333 Commits

Author SHA1 Message Date
Jordan Woyak bd14ad5300 Merge branch 'master' into vertex-loader-cleanup 2013-02-25 17:55:44 -06:00
Jordan Woyak 46adbfa9ed Merge branch 'real-wiimote-scanning' 2013-02-25 17:33:34 -06:00
Rachel Bryk e5c53e371f Make error message for loading save state with wrong dsp engine shorter. 2013-02-25 18:12:48 -05:00
Rachel Bryk a450ba4420 Abort load state if it uses a different dsp engine, instead of crashing. 2013-02-25 15:58:12 -05:00
degasus d173d646de fix last commit by neobrain 2013-02-25 16:11:24 +01:00
NeoBrainX 73a0bdd379 Build fixing. 2013-02-25 12:42:52 +00:00
NeoBrainX 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
Jordan Woyak 6b2804e296 Possible crashfix for OSX. 2013-02-24 22:29:33 -06:00
degasus c86b892f95 Revert "remove numTexGens=7 hack. only cg wasn't able to handle more then 8 texcoords" 
This reverts commit 4653adecf1.

Also dx9 isn't able to hanlde more than 11 varying registers.
More frustrating is the lightning issue by this commit. I don't know why it happens...
 2013-02-24 20:51:44 +01:00
skidau dc98ce5922 Added the addeo instruction to the JIT tables. Fixes Inkub (WiiWare). 2013-02-24 23:05:12 +11:00
Jordan Woyak 52dacaa3e3 Make the posmtx vertex attribute an int instead of converting to and from a float. 2013-02-23 20:54:30 -06:00
Jonathan Jones 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
degasus 0a05fcade4 fix glsl compilation error on intel 2013-02-22 12:19:52 +01:00
degasus d9adc26332 real Star Fox fix 2013-02-22 12:14:39 +01:00
degasus 242d960781 increase buffer size 
32M UBO, 16M Vertex, 2M Index
 2013-02-22 10:25:38 +01:00
Jordan Woyak 86935ab4fd forceinline IndexGenerator::WriteTriangle 2013-02-22 03:22:20 -06:00
degasus e270c8b153 fix Star Fox 2013-02-22 09:54:19 +01:00
Jordan Woyak d3f1bb93f2 Use DataWrite in a few more places. 2013-02-22 02:19:59 -06:00
Jordan Woyak db1be085c2 VertexManager cleanup 2013-02-22 01:41:52 -06:00
Jordan Woyak 21bd5be753 Buffer size changes. 2013-02-21 23:12:53 -06:00
skidau d76ca57837 Fixed a JIT timing bug that prevented Eternal Darkness from booting in Single Core mode. 2013-02-22 15:13:49 +11:00
Jordan Woyak f16dcfe6f6 Remove logic from IndexGenerator which does not seem to match that of Video Software. 2013-02-21 21:02:49 -06:00
Jordan Woyak 368c78dd5c IndexGenerator cleanup. 2013-02-21 19:11:07 -06:00
degasus 9332775b68 default upload method for nvidia is buffersubdata 2013-02-21 21:59:40 +01:00
Jordan Woyak 677c6229ad Experimental VertexLoader cleanup! 2013-02-21 14:41:06 -06:00
Jordan Woyak a92c93f870 Automate some calculations, with templates! 2013-02-21 13:29:05 -06:00
Jordan Woyak 7987d6babb Use templates for 8+16 bit indexed versions of SSSE3/SSE4 TextCoord reading. 2013-02-21 12:42:09 -06:00
degasus bed29f843f fix spelling 2013-02-21 18:29:17 +01:00
degasus 40e17b4cb8 add option for hacked upload and disable it by default 2013-02-21 18:18:44 +01:00
degasus d0e8217714 remove intel pixel shader hack 
did not work correctly and made warnings on dx11
 2013-02-21 17:44:56 +01:00
degasus c7f4d6b9ac wrapper for s_pCurBufferPointer 2013-02-21 13:45:48 +01:00
degasus 4b4dce1bd9 build fix 2013-02-21 13:00:19 +01:00
degasus 76e6085e31 consistently usage of buffer pointers 2013-02-21 12:36:29 +01:00
degasus 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
degasus 66d0c1c301 small cleanups of s_pCurBufferPointer 2013-02-21 11:45:29 +01:00
degasus 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
degasus 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
Jordan Woyak dc776a19a0 Cleanup VertexLoader's Color functions a bit. 2013-02-21 02:49:17 -06:00
Jordan Woyak 660fc12927 Cleanup Position loader functions. 2013-02-21 02:19:06 -06:00
Jordan Woyak 5efdcef34a No longer have the signed/unsigned hack I guess. 2013-02-21 00:49:47 -06:00
Jordan Woyak 3938d3713b Fix what I broke. 2013-02-21 00:40:22 -06:00
Jordan Woyak 5b63472ad7 Templatify Normal Loader functions. 2013-02-21 00:10:06 -06:00
Jordan Woyak 5e78f8a176 Templatify TextCord Loader functions. 2013-02-20 20:43:53 -06:00
Jordan Woyak 8f256237a3 Templatify DataReader a bit. 2013-02-20 20:21:25 -06:00
Jordan Woyak 6a13a4e5ed Add template "swap" function to CommonFuncs. 2013-02-20 20:20:53 -06:00
Jordan Woyak e9232280c4 Fix OSX! 2013-02-20 17:35:41 -06:00
Jordan Woyak f3e91bc10d Hopefully kill a stupid warning on Windows. 2013-02-20 17:30:34 -06:00
Jordan Woyak e7c93b8ac3 Minor sampler cache cleanup. 2013-02-20 17:15:10 -06:00
Jordan Woyak b7fae1febb Fix my DX11 texture-related failure.. 
Fixes issue 6026. (probably)
 2013-02-20 14:18:21 -06:00
Jordan Woyak 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
Jordan Woyak eae20b77a8 Remove some unneeded sampler-related calls in BPStructs. 2013-02-20 02:01:54 -06:00
Jordan Woyak 294cb165ba Don't load level 0 twice for 1-level textures in DX11. 2013-02-19 22:39:28 -06:00
Jordan Woyak 55c2a01744 Check for sampler object support, just to be nice. 2013-02-19 21:24:08 -06:00
Jordan Woyak 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
degasus d93e57ff22 revert b5fe39b8c7 "fix texture parameters" 
these parameters are really floats. I was just wrong
 2013-02-19 22:20:39 +01:00
degasus b5fe39b8c7 fix texture parameters 2013-02-19 17:28:46 +01:00
degasus 50f4bf114e Revert "map_orphan_and_risk - next try for upload method" 
This reverts commit 17747fcfb8.

On orphaning, some gl drivers do heurisitics where to store the buffer.
As the hack may only work on pinned memory, it would be much less deteministic.
 2013-02-19 15:51:48 +01:00
degasus 0f2ee45d96 remove ati workaroung for mipmap creation 
isn't needed any more by merging mapmap_fixes
 2013-02-19 15:40:34 +01:00
degasus 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
skidau 718a1b5ded Fixed a buffer overflow in the OpenAL buffer. 2013-02-19 23:18:13 +11:00
degasus fed574d08b solve merge conflict 2013-02-18 18:55:42 +01:00
degasus 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
NeoBrainX 19ab5bf50d TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs. 2013-02-18 17:14:56 +01:00
NeoBrainX 0f617183a8 Add a possible TODO. 
Dunno if the hardware behaves like this, but it likely does.
 2013-02-18 14:54:24 +00:00
degasus 4653adecf1 remove numTexGens=7 hack. only cg wasn't able to handle more then 8 texcoords 2013-02-17 22:37:00 +01:00
degasus bef24b5c6b new format for gl extensions 2013-02-17 21:41:00 +01:00
Jordan Woyak d0ea94a2aa WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation. 2013-02-17 13:52:04 -06:00
Jordan Woyak 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
Jordan Woyak 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
Jordan Woyak 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
Jordan Woyak 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
Jordan Woyak 9ac2fbb0a5 Fix a memleak. Probably/maybe improve USBGecko performance. 2013-02-17 00:19:42 -06:00
Jordan Woyak 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
Jordan Woyak 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
skidau 123035a192 Bulk send TCP data to the client with the emulated USB Gecko. 
Fixes issue 6006.
 2013-02-17 15:27:15 +11:00
skidau 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
Jordan Woyak 53aec6c476 Fix OGL perf queries and make them not slow! 2013-02-16 19:30:24 -06:00
Jordan Woyak 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
Jordan Woyak 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
NeoBrainX 6fd96a162f Video_Software: Fix ZComploc option breaking stuff. 2013-02-15 17:55:16 +01:00
NeoBrainX fb0102d441 Video_Software: Fix the ZFreeze option doing nothing. 2013-02-15 17:47:29 +01:00
NeoBrainX 183ad0c628 Video_Software: Toggable zfreeze and early_z support for testing. 2013-02-15 17:45:33 +01:00
degasus 334bd52f2c NaNs handling in pixel shader 2013-02-15 15:46:31 +01:00
degasus e259343275 fix efb copy shaders 2013-02-15 13:13:45 +01:00
Jordan Woyak 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
Jordan Woyak 1f20a24a04 Minor changes. 2013-02-14 21:02:41 -06:00
Jordan Woyak 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
Jordan Woyak cda88a8c1e Random improvements. 2013-02-14 18:43:11 -06:00
Jordan Woyak 306e6b1d80 Turn off continuous scanning by default. 2013-02-14 18:43:11 -06:00
degasus 9f4a616f2e build fix 2013-02-14 19:04:52 +01:00
degasus a0ef58418b workaround for buggy intel windows driver. revert this as soon as there are newer driver 2013-02-14 18:59:45 +01:00
degasus 0325e37bfb merge glsl headers into one place 2013-02-13 21:34:48 +01:00
Jordan Woyak e57ff06130 Futile attempts at fixing Windows. 2013-02-13 14:00:15 -06:00
degasus 3392562501 rewrite efb copy shader, copied from dx11 2013-02-13 18:01:06 +01:00
degasus 21b83b436c create shader cache directoy 2013-02-13 16:50:56 +01:00
degasus b3675d15dc enable shader cache again 2013-02-13 16:30:15 +01:00
degasus 398b37f371 fix ValidateShaderIDs 2013-02-13 15:16:32 +01:00
degasus 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
Jordan Woyak 77381a1af2 Futile attempts at fixing OS X. 2013-02-12 21:37:47 -06:00
Jordan Woyak 7f305ba822 Fix sloppy connection logic. 2013-02-12 18:59:45 -06:00
Jordan Woyak 12674b3164 Possibly improve real wiimotes on Windows. 2013-02-12 17:01:51 -06:00
Ryan Houdek 818a376bd4 Fix header guard and definitions not being set to 1 2013-02-12 14:11:29 -06:00
Jordan Woyak 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
Jordan Woyak 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
Jordan Woyak da53ca8ee3 "Wait for the wiimote to connect"? I think that's a horrible idea. 2013-02-12 00:19:27 -06:00
Jordan Woyak a6461ca186 Improve wiimote reconnection on changing wiimote sources. 2013-02-11 23:39:04 -06:00
Jordan Woyak fa10335c55 Make continuous scanning optional. 2013-02-11 17:58:56 -06:00
Jordan Woyak f3d25f2cb0 OSX buildfix! 2013-02-11 16:07:01 -06:00
Jordan Woyak 0fb7f65e04 Problems on Windows? Just SLEEP twice as long! 2013-02-11 15:58:23 -06:00
Jordan Woyak c2d2fb8c7c Try to improve real wiimotes on Windows. 2013-02-11 15:21:58 -06:00
Ryan Houdek 8923f0e13b Fix header guard and definitions not being set to 1 2013-02-11 15:06:40 -06:00
Jordan Woyak b8fd5c0c30 Fix Windows for real! 2013-02-11 05:57:55 -06:00
Jordan Woyak c267be2682 Hopefully fix windows! 2013-02-11 05:30:51 -06:00
Jordan Woyak 7a053d0f07 buildfix! 2013-02-11 03:50:54 -06:00
Jordan Woyak 05ec90488b Make real wiimotes not so crappy on Windows hopefully. 2013-02-11 03:39:09 -06:00
Jordan Woyak 1c64b1993d Change the ugly "no banner" banner to the sexy "X" from the website. 2013-02-09 17:04:41 -06:00
NeoBrainX 6645bd6fc6 Fix a crash in the FifoPlayer dialog. 2013-02-09 12:39:19 +01:00
Jordan Woyak 50c83d614c More attempts at fixing Windows and OS X. 2013-02-08 21:20:54 -06:00
Jordan Woyak 9bb9286cd3 OSX buildfix! 2013-02-08 16:59:59 -06:00
Jordan Woyak 1f1b4a6992 Hopefully make real wiimotes on OSX less crashy. 2013-02-08 16:54:48 -06:00
Jordan Woyak a11827cdf0 Use different reply delays for various DI commands. 
Fixes issue 5983.
 2013-02-08 16:27:14 -06:00
Jordan Woyak 1998da867b OSX fix maybe. (based on jchadwick's patch) 2013-02-08 12:33:45 -06:00
Jordan Woyak 8ce58759e3 Remove some old nonsense. 2013-02-07 23:52:50 -06:00
Jordan Woyak 87bbdbf542 Remove settings stuff that was not actually used anywhere. 2013-02-07 23:23:32 -06:00
Jordan Woyak 026793fa4a Fixup real wiimote GUI. 2013-02-07 23:17:51 -06:00
Jordan Woyak 3063942dd0 some cleanup 2013-02-07 21:54:23 -06:00
Jordan Woyak 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
Jordan Woyak a2ca76ebd9 Buildfix. 2013-02-07 15:16:41 -06:00
Jordan Woyak 57ea09dcc2 Fix BT-less! 2013-02-07 14:46:01 -06:00
NeoBrainX 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
Jordan Woyak 9ecfb5e75d Buildfix for real! 2013-02-07 14:42:50 -06:00
Jordan Woyak 85f25ded4c Buildfix! 
Programming for Windows on Linux is hard, OK?
 2013-02-07 14:22:45 -06:00
Jordan Woyak 8f5fb7e6f9 Hopefully buildfix Windows. (thanks for the patch, RachelB) 2013-02-07 14:15:47 -06:00
NeoBrainX ed0abc9dc5 Merge branch 'mipmap_fixes'. 2013-02-07 20:40:33 +01:00
NeoBrainX 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
degasus 10567cb23f always write to uv coords 2013-02-07 13:23:20 +01:00
degasus f079b04a5d also check for glsl errors on linking, activation GLSL_DEBUG again (slowdown on shader compilation) 2013-02-07 12:47:41 +01:00
degasus 9987765b1f build fix 2013-02-07 10:48:42 +01:00
degasus 376a807dea first try of osx fix, mostly by pauldachz 2013-02-07 10:34:29 +01:00
Rachel Bryk 0ebe35e0ef Disable play and record buttons if an iso was selected, but is later deselected. 2013-02-07 00:31:57 -05:00
Rachel Bryk 6bc9e7579c Disable start/play recording buttons when no iso is selected. 2013-02-06 20:56:07 -05:00
degasus dae1226e1b workaround for division by zero on fog calculation 2013-02-07 02:21:30 +01:00
Jordan Woyak 9cbfddd788 Only delay DI and fs IPC replies. 
Fixes issue 5982.
 2013-02-06 16:52:51 -06:00
Jordan Woyak ef9d7fb789 Fix compilation with SDL2. (based on a patch from matthewharveys) 
Fixes issue 5971.
 2013-02-05 21:08:52 -06:00
degasus e7a8d3f854 check for GL_ARB_sync, it's in ogl 3.2 2013-02-06 01:05:19 +01:00
Jordan Woyak 708fed92c8 Clean up SDL includes a bit. Maybe fix an SDL2 problem. 2013-02-05 15:34:23 -06:00
Jordan Woyak f506783c37 Number "unknown" axes in OSX rather than call them all "unk". 2013-02-05 13:51:08 -06:00
degasus ef602fd643 workaround for glGetUniformLocation in efb2ram 2013-02-05 18:22:23 +01:00
degasus 76adc77fa6 bigger buffers 2013-02-05 18:01:27 +01:00
Jordan Woyak 937d9e9007 Revert "Only delay DI command replies." 
Fix "Wii Party" again.

This reverts commit fb5b5e8b63.
 2013-02-05 02:51:34 -06:00