Commit Graph

19085 Commits

Author SHA1 Message Date
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
Tillmann Karras 00aefa5e08 DolphinWX: decompress discs to calculate MD5 hash 2015-10-12 02:35:43 +02:00
Tillmann Karras efe71e686b DiscIO: implement CISOBlob::GetDataSize()
This is a best-effort approach, since the CISO format does not save the
original file size.
2015-10-12 02:33:38 +02:00
Tillmann Karras 1a8e2e16e3 DiscIO: implement WbfsBlob::GetDataSize() 2015-10-12 02:33:04 +02:00
Tillmann Karras a92b4bda95 DiscIO: fix reading the last sector in WBFS
Instead of rounding down, round up.
2015-10-12 02:31:51 +02:00
Tillmann Karras 3a2efc9f4f DiscIO: merge initial WBFS reads 2015-10-12 02:31:51 +02:00
Tillmann Karras f416106eec DiscIO: pre-swap WLBA 2015-10-12 02:31:51 +02:00
Tillmann Karras b1100e4aa0 DiscIO: use std::min() in WBFS 2015-10-12 02:31:51 +02:00
Tillmann Karras 4eace2b49e CMake: simplify FindMiniupnpc.cmake
miniupnpc.h provides MINIUPNPC_API_VERSION since 1.7 and we require 1.7
or later, so there is no reason to have version detection code for older
versions.
2015-10-12 02:26:35 +02:00
flacs c8382cca83 Merge pull request #3167 from Tilka/wrapper
VertexLoaderUtils: remove simple wrapper functions
2015-10-12 00:41:25 +02:00
Tillmann Karras 9f8981c7c0 VertexLoaderUtils: remove simple wrapper functions 2015-10-11 23:40:50 +02:00
Tillmann Karras ae999cb43c Wiimote: simplify DoState() parameters 2015-10-11 23:37:34 +02:00
Scott Mansell 645e4cbbee PixelShaderGen: Use arrays of texture samplers. 2015-10-12 05:06:39 +13:00
flacs ba20f114eb Merge pull request #3138 from ShadowsFriend/master
Fix OProfile discovery and drop bfd dependency
2015-10-11 16:43:51 +02:00
Christian Widmer b99d1a0a20 Fix OProfile discovery and drop bfd dependency
Adds a cmake module to correctly discover OProfile and adjusts the
corresponding CMakeLists to make use of it. Additionally removes
linking against the bfd library when compiling with OProfile because
Dolphin does not use it.
2015-10-11 16:27:03 +02:00
flacs c4fe2cd287 Merge pull request #3147 from ShadowsFriend/qtinstall_fix
DolphinQt: Install binary for systems not matching APPLE
2015-10-11 15:54:02 +02:00
flacs 94d20131bb Merge pull request #3151 from ShadowsFriend/memtools_unistd
Include unistd.h in memtools.cpp to fix nopch
2015-10-11 15:52:40 +02:00
flacs e389a3cafe Merge pull request #3131 from delroth/fifo-pad
FifoDataFile: Revert PadFile changes from 4.0-1127.
2015-10-11 15:50:24 +02:00
flacs a7b6ae8f2c Merge pull request #3160 from Tilka/style
Misc. style fixes
2015-10-11 15:36:06 +02:00
flacs f3c88137e7 Merge pull request #2798 from lioncash/search
Debugger: Use wxSearchCtrls instead of wxTextCtrl for address searching.
2015-10-11 15:29:59 +02:00
flacs fe164e3a90 Merge pull request #3137 from lioncash/namespace
StreamADPCM: Convert into a namespace
2015-10-11 15:27:45 +02:00