Commit Graph

1602 Commits

Author SHA1 Message Date
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
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
b1a2915304 Merge branch 'master' into windows-unicode 2013-03-03 15:05:10 -06:00
a01f793f59 Fix ARM build. 2013-03-03 07:37:22 +00:00
2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -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
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
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
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
dea1e2827d Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06: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
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
0c16489c39 Merge branch 'VideoSoftware-savestates' 2013-02-28 13:36:29 -05:00
6b80e6f83c Tweak Vertex/Index buffer handling a bit. 2013-02-27 01:57:02 -06:00
692e39d1bb Merge branch 'arm-noglsl' 2013-02-27 02:22:08 +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
08fe3c213a Abort loading states from incompatible graphics backends. 2013-02-26 18:28:56 -05:00
a650ae8c7b workaround for base vertex. damn old nvidia driver 2013-02-26 23:15:55 +01:00
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
8b7141d3de Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer."
This reverts commit 380f22ca0e.

Yeah, reverting a revert.
2013-02-26 08:57:35 +01: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
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
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
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
52dacaa3e3 Make the posmtx vertex attribute an int instead of converting to and from a float. 2013-02-23 20:54:30 -06: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
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
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
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
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