Commit Graph

18951 Commits

Author SHA1 Message Date
JosJuice 6c25c63301 Limit size of loaded file systems
If a disc image is malformed in a specific way, Dolphin
will try to allocate a lot of memory, making it crash.
To avoid that, this change adds an artificial limit for
the size of file systems that Dolphin will try to load.
2015-10-28 21:47:19 +01:00
Scott Mansell 5228758383 Merge pull request #3192 from lioncash/typedef
WII_IPC_HLE: Remove unused typedef
2015-10-22 21:09:41 +13:00
Lioncash f696b323c0 WII_IPC_HLE: Remove unused typedef 2015-10-21 13:43:22 -04:00
Markus Wick dddc834c14 Merge pull request #3184 from mimimi085181/check-hash-on-partial-texture-updates
Check the hash before applying efb copies as partial texture updates
2015-10-19 09:44:24 +02:00
Scott Mansell 1ba600b688 Merge pull request #3145 from catzilla4/master
FreeBSD Compilation fix
2015-10-19 17:29:34 +13:00
mimimi085181 ff709247e2 Check the hashes of efb copies before applying them as partial texture updates 2015-10-18 16:36:38 +02:00
flacs 018a05b77e Merge pull request #3182 from JosJuice/readfromvolume-length
Remove length parameter from DiscScrubber::ReadFromVolume
2015-10-18 15:04:32 +02:00
JosJuice 4d77d12f01 Remove length parameter from DiscScrubber::ReadFromVolume
The function only makes sense when the length is 4. All current callers
use the length 4, so this change doesn't affect any behavior.
2015-10-18 09:24:31 +02:00
Scott Mansell 2be909849b Merge pull request #3180 from phire/fix-gles
Make sure FORCE_EARLY_Z is defined for GLES
2015-10-18 14:58:22 +13:00
flacs 15131575c1 Merge pull request #3183 from JosJuice/discscrubber-getdolsize
Remove DiscScrubber::GetDOLSize in favor of IFileSystem::GetBootDOLSize
2015-10-18 01:05:09 +02:00
JosJuice 618ccf6109 Remove DiscScrubber::GetDOLSize in favor of IFileSystem::GetBootDOLSize
IFileSystem::GetBootDOLSize acts the same. The only difference is that it
reads the DOL offset on its own, but this change makes that optional.
2015-10-17 20:52:26 +02:00
Scott Mansell 9ee610830c Make sure FORCE_EARLY_Z is defined for GLES 2015-10-18 02:37:14 +13:00
Scott Mansell 8b1138943d Merge pull request #3179 from phire/mesa-early-z
Support Conservative Depth as a fallback for Early Z (Mesa support for ZCompLoc)
2015-10-18 02:14:52 +13:00
Scott Mansell e7b2a22225 Support Conservative Depth as a fallback for EarlyZ
Allows Mesa based drivers to support ZCompLoc
2015-10-18 01:46:54 +13:00
shuffle2 34d46d6910 Merge pull request #3178 from shuffle2/ucrt-fread-workaround
patch win7 ucrtbase, and note versions
2015-10-17 05:02:18 -07:00
shuffle2 0acac35d77 patch win7 ucrtbase, and note versions 2015-10-17 04:24:20 -07:00
Markus Wick 4d3d947efc Merge pull request #3157 from degasus/videosw3
VideoSW: Wipe alpha on bypass EFB
2015-10-17 12:02:55 +02:00
Scott Mansell ac8976689b Merge pull request #3177 from Tilka/fix_warnings
PixelShaderGen: silence -Wformat-security warnings
2015-10-17 17:44:29 +13:00
flacs e289cb87e5 Merge pull request #3161 from shuffle2/ucrt-fread-workaround
exchange XSaveWorkaround for ucrtFreadWorkaround
2015-10-17 05:41:40 +02:00
Shawn Hoffman ca31c62c01 exchange XSaveWorkaround (which was fixed in VS2015) for ucrtFreadWorkaround (which was broken in VS2015). 2015-10-16 20:26:34 -07:00
flacs 63b08618c2 Merge pull request #3174 from ShadowsFriend/generic_build_fix
VideoCommon: Add includes for generic build
2015-10-17 05:08:30 +02:00
flacs dc096d2fe5 Merge pull request #3176 from lioncash/namespace
Core: Move a global into a namespace
2015-10-17 05:07:55 +02:00
Tillmann Karras 1df455bd13 PixelShaderGen: silence -Wformat-security warnings 2015-10-17 05:05:50 +02:00
flacs d85344bd58 Merge pull request #3155 from degasus/videosw
VideoSW: Split up OGL window handling
2015-10-17 04:56:44 +02:00
Lioncash c756025902 Core: Move a global into a namespace 2015-10-16 22:52:41 -04:00
Pierre Bourdon c0d157e6f6 Merge pull request #3175 from imirkin/master
make gcc check the printf format strings
2015-10-17 03:44:28 +02:00
Ilia Mirkin 2fc2b82963 VideoCommon: teach gcc to type-check the arguments fed to Write()
Note that the "this" implicit argument counts as 1, which is why all the
printf arguments are shifted over one.
2015-10-16 18:20:37 -04:00
Ilia Mirkin 5380fd9dba VideoCommon: fix variable types fed to Write() function 2015-10-16 18:20:36 -04:00
flacs 763f17beaf Merge pull request #3173 from lioncash/cruft
DSPHLE: Remove duplicated struct
2015-10-16 22:00:46 +02:00
Christian Widmer 252a3d16c2 VideoCommon: Add includes for generic build
On x86_64 and arm64 builds Common/MsgHandler.h and Common/Logging/Log.h are
indirectly included through the corresponding VertexLoaders, Emitters
and lastly Assert.h. Because the generic build does not build a vertex
loader JIT it does not include those and fails at compile time.
Thanks to HdkR and mibofra!
2015-10-16 20:18:27 +02:00
Lioncash 1b3307043b DSPHLE: Remove duplicated struct
This is already present in the DSPHLE class directly
2015-10-16 13:02:21 -04:00
flacs 05e339a605 Merge pull request #3139 from JosJuice/fix-wii-root
Mark which Wii root to use in the NAND path code
2015-10-16 16:49:34 +02:00
Markus Wick d12b026ecb Merge pull request #3165 from mimimi085181/partial-texture-updates-same-offset
Do not try to load strided efb copies or ones with wrong dimensions
2015-10-16 10:02:36 +02:00
comex c22d1d68ab Mark which Wii root to use in the NAND path code.
It's used by both the GUI to do things like install WADs and check up on
the system menu, in which case the global root should be used, and by
/dev/es, in which case the local one should.  The latter isn't
*terribly* useful today, since no contents will ever be installed in
temporary roots (although it's still relevant for data directories), but
converting the whole thing makes sense because then it will Just Work
once the entire NAND is synced.

Because it would have been a bit of work to split it up (but I can if
desired), this commit also contains some basic cleanup of
NANDContentLoader:

(1) The useless interface class INANDContentLoader is removed and the
    methods are changed to just return CNANDContentLoader (the only
    implementation);
(2) CNANDContentManager is changed to use unique_ptr and cleaned up a
    bit.
2015-10-16 09:10:39 +02:00
flacs 93299e2dd0 Merge pull request #3169 from endrift/update-miniupnpc
Externals: Update miniupnpc to API version 14
2015-10-16 06:09:30 +02:00
flacs 0d0704453e Merge pull request #3070 from lioncash/vert
VertexShaderManager: Get rid of float pointer casts.
2015-10-16 05:48:27 +02:00
flacs e57f1796b5 Merge pull request #3114 from lioncash/ui
ControllerConfigDiag: Amend button sizing issues on hi-DPI displays
2015-10-16 05:48:07 +02:00
Lioncash 419fed3952 VertexShaderManager: Get rid of other magic constants 2015-10-15 23:41:42 -04:00
Lioncash b5b304cff2 VertexShaderManager: Get rid of float pointer casts 2015-10-15 23:34:54 -04:00
flacs 28cb62dc7f Merge pull request #3171 from lioncash/ucode
UCodes: Minor cleanup
2015-10-16 05:03:12 +02:00
Lioncash 03986c6fad UCodes: Simplify ExramRead 2015-10-15 22:48:22 -04:00
Lioncash c420c52308 UCodes: Get rid of pointer casts 2015-10-15 22:45:03 -04:00
mimimi085181 af28934703 Do not delete strided efb copies on load
This hopefully allows to use partial texture updates with strided efb copies that start at the same offset as the loaded texture
2015-10-15 00:45:55 +02:00
Jeffrey Pfau efb7272396 Externals: Update miniupnpc to API version 14 2015-10-13 23:35:52 -07:00
degasus b69bff0690 VideoSW: Use OpenGL Core context 2015-10-14 00:13:54 +02:00
degasus 61c3a0d9e4 VideoSW: Split up OGL window handling
This removes OSD support for video software, but it was already broken before.

This commit does not try to fix coding style issues, the rewrite of this presentation API is splitted up.
2015-10-14 00:13:54 +02:00
flacs b0bbe52cc9 Merge pull request #3164 from phire/samplerArrays
PixelShaderGen: Use arrays of texture samplers.
2015-10-12 18:44:14 +02:00
flacs 97fbbecdc4 Merge pull request #3168 from Tilka/miniupnpc
CMake: simplify FindMiniupnpc.cmake
2015-10-12 14:32:57 +02:00
flacs 4c3dc0c1ae Merge pull request #3047 from Tilka/decompress_for_md5
DolphinWX: decompress discs to calculate MD5 hash
2015-10-12 05:21:34 +02:00
flacs 4467c762d7 Merge pull request #3166 from Tilka/wiimote_state
Wiimote: simplify DoState() parameters
2015-10-12 05:21:21 +02:00