Scott Mansell
68b415ba87
Merge pull request #3019 from mimimi085181/store-base-hash
...
Store the base hash for paletted textures in the texture cache entries
2015-09-12 16:24:29 +12:00
Scott Mansell
02842cb34b
Merge pull request #3006 from phire/deadlock
...
Fix deadlock with KHR_debug.
2015-09-12 16:19:58 +12:00
Scott Mansell
ee7285a1db
Merge pull request #3008 from Lionel07/qt-screensaver
...
Qt: Disable Display Sleep when game is running (Windows)
2015-09-12 16:13:51 +12:00
Scott Mansell
2c67ad88cd
Merge pull request #3023 from JosJuice/qt-pixmaps
...
DolphinQt: Bring pixmaps up to date with DolphinWX and themes
2015-09-12 16:13:35 +12:00
Corwin Mcknight
b2e4019383
DolphinQt: Disable Display Sleep on Windows.
...
Disables Display Sleeping on Windows on DolphinQt while the game runs,
and re-enables it after the game closes.
2015-09-11 16:06:59 -07:00
flacs
c5685ba53a
Merge pull request #2972 from lioncash/align
...
General: Replace GC_ALIGN macros with alignas
2015-09-11 17:00:13 +00:00
Lioncash
d7acf06505
Merge pull request #2985 from JosJuice/iselfordol
...
DolphinWX: Don't use IsElfOrDol outside of ISOFile
2015-09-11 12:28:57 -04:00
JosJuice
cb496994e3
DolphinQt: Bring pixmaps up to date with DolphinWX and themes
...
Also removed PLUGIN from names because there aren't actually any plugins.
2015-09-11 16:13:18 +02:00
flacs
c07d672b31
Merge pull request #3003 from dolphin-emu/revert-2961-printf
...
Partially revert "General: Toss out PRI macro usage"
2015-09-11 14:08:58 +00:00
Lioncash
19459e827f
Partially revert "General: Toss out PRI macro usage"
2015-09-11 09:49:00 -04:00
Ryan Houdek
c319fbb98d
Merge pull request #3013 from aserna3/Security101
...
Removed fastmem from Android UI
2015-09-11 09:14:50 -04:00
mimimi085181
e408e0ab17
Store the base hash for paletted textures in the texture cache entries
2015-09-10 22:28:59 +02:00
Ryan Houdek
3014feedc8
Merge pull request #3012 from degasus/destAlpha
...
VideoCommon: Drop "Disable destAlpha" hack
2015-09-10 13:56:43 -04:00
Markus Wick
257f2ef739
Merge pull request #3000 from mimimi085181/efb-copies-garbage-collection
...
Perform garbage collection for efb copies
2015-09-10 12:52:54 +02:00
mimimi085181
38f6cf2089
Perform garbage collection for efb copies
...
This checks every TEXTURE_KILL_THRESHOLD frames, to see if the hash for the memory area of the efb copy has hanged. If it has changed, the efb copy can be removed, it wouldn't be used anymore. Before this pr, some efb copies would never be deleted.
Fixes issue https://bugs.dolphin-emu.org/issues/6101 and possibly some other VRAM leaks.
2015-09-10 11:58:58 +02:00
Scott Mansell
921bab6b4d
Merge pull request #3015 from phire/SplitLogtypes
...
Split OpenGL errors into a separate logtype from video errors.
2015-09-10 18:55:29 +12:00
Scott Mansell
ef4974b6a2
Remove unused log type.
2015-09-10 18:39:32 +12:00
Scott Mansell
0ed1e977cc
Rearrange the logtypes into something closer to alphabetical order.
...
Also fix up a few of the long names.
2015-09-10 18:39:08 +12:00
Scott Mansell
de9310fe70
Split OpenGL errors into a separate logtype from Video errors.
...
Allows them to be enabled/disabled separately.
2015-09-10 18:38:45 +12:00
Scott Mansell
f2771695a2
Merge pull request #3014 from lioncash/cpath
...
ExpressionParser: Make all control paths return a value in operator std::string
2015-09-10 14:48:30 +12:00
Lioncash
88c9c6d086
ExpressionParser: Make all control paths return a value in operator std::string
2015-09-09 22:41:47 -04:00
Anthony Serna
cbd7b0793f
Removed fastmem from Android UI
2015-09-09 14:46:20 -07:00
degasus
74b20e627c
VideoCommon: Drop "Disable destAlpha" hack
...
This option has no use any more, neither performance nor driver workaround.
2015-09-09 21:31:54 +02:00
Scott Mansell
38d05cd70f
Merge pull request #3007 from phire/khr_debug_notification
...
OpenGL: drop log level of some spammy KHR_debug messages.
2015-09-09 17:34:27 +12:00
Lioncash
8f13d50a4e
Merge pull request #2989 from lioncash/filter
...
DiscIO/VS: Remove an empty filter
2015-09-08 21:01:00 -04:00
Scott Mansell
a95adba39b
Drop DEBUG_SEVERITY_NOTIFICATION messages down to DEBUG_LOG
2015-09-09 12:22:52 +12:00
Scott Mansell
b9b80191d5
Fix deadlock with KHR_debug.
...
An KHR_debug callback could end up waiting for a mutex
on a thread which calls windows system functions.
While this is not expressly forbidden by the standards,
it does forbid directy calling windows system functions
from a KHR_debug callback. Close enough.
2015-09-09 12:05:24 +12:00
flacs
067d65bbf5
Merge pull request #3005 from jcowgill/hw-spelling-mistake
...
HW: Fix spelling mistake
2015-09-08 20:37:24 +00:00
James Cowgill
50d5a9a9bc
HW: Fix spelling mistake
2015-09-08 21:11:28 +01:00
flacs
48031eaff7
Merge pull request #2974 from Tilka/fprf
...
Jit64: fix errors in FPRF calculation
2015-09-08 18:59:22 +00:00
flacs
0c381d6547
Merge pull request #2975 from lioncash/emit
...
x64Emitter: Simplify/compress some conditionals
2015-09-08 18:44:54 +00:00
Ryan Houdek
631fe4ffc2
Merge pull request #2966 from Sonicadvance1/profile_add_runcount
...
Add run count to the JIT profile information
2015-09-08 11:18:36 -05:00
Lioncash
19da48d580
Merge pull request #3001 from Armada651/readme-issue
...
Readme: Update issue tracker URL.
2015-09-08 12:15:15 -04:00
Ryan Houdek
5d7f834cde
Add run count to the JIT profile information
2015-09-08 11:09:52 -05:00
Markus Wick
81c07d4919
Merge pull request #2990 from lioncash/noncopy
...
Common: Alter semantics of the NonCopyable mixin
2015-09-08 11:08:58 +02:00
Ryan Houdek
2e02de6587
Merge pull request #2998 from Sonicadvance1/GLES_BBox
...
[GLES] Enable bounding box support.
2015-09-08 02:38:54 -05:00
Scott Mansell
332e81d2d7
Merge pull request #2984 from JosJuice/dvdinterface-round-down
...
DVDInterface: Use ROUND_DOWN
2015-09-08 12:43:11 +12:00
Jules Blok
9cfb411a93
Readme: Update issue tracker URL.
2015-09-07 22:01:19 +02:00
Ryan Houdek
5520155e14
Merge pull request #2999 from Sonicadvance1/AArch64_test_fix
...
[AArch64] Fix Test&Branch to relative location instructions.
2015-09-07 13:47:48 -05:00
Ryan Houdek
2ad26ab3e9
[AArch64] Fix Test&Branch to relative location instructions.
...
Wasn't masking by the size of the offset encoding so negative values were killing the instruction
Missed commiting this in my integer gatherpipe PR.
Fixes crashing on AArch64.
2015-09-07 13:38:58 -05:00
Ryan Houdek
bfb544e1fb
[GLES] Enable bounding box support.
2015-09-07 12:07:27 -05:00
Markus Wick
5585c5adc2
Merge pull request #2994 from aserna3/master
...
Properly implemented confirm on stop CLI switch
2015-09-07 14:00:17 +02:00
Ryan Houdek
a9a339a00c
Merge pull request #2962 from Sonicadvance1/aarch64_integer_gatherpipe
...
[AArch64] Implement integer gatherpipe writes.
2015-09-07 06:20:01 -05:00
Scott Mansell
1f800b80dd
Merge pull request #2960 from phire/improve_efb2tex
...
Make efb2tex behave much more like efb2ram.
2015-09-07 14:12:03 +12:00
Ryan Houdek
99a7dfaf5e
Merge pull request #2965 from Sonicadvance1/Android_config_changes
...
[Android] Fix multi-gamecube controller input, config changes
2015-09-06 20:07:32 -05:00
Anthony Serna
a5d6072a45
Properly implemented confirm on stop CLI switch
2015-09-06 14:35:26 -07:00
Lioncash
1b026364bf
Merge pull request #2992 from aserna3/master
...
Implemented CLI switch to disable confirm on stop
2015-09-06 16:55:11 -04:00
Anthony Serna
ad1a8a1b31
Implemented CLI switch to disable confirm on stop
2015-09-06 13:08:29 -07:00
Ryan Houdek
d2ac382a14
Merge pull request #2986 from degasus/master
...
VideoBackends: Reimplement SSAA, now for D3D + OGL
2015-09-06 13:31:49 -05:00
Lioncash
53465e329a
Common: Alter semantics of the NonCopyable mixin
...
Uses delete to make the unimplemented functions detectable at compile time
and not link time if they are used.
The move constructor and assignment operator are removed as moves are not
copies, but transfers of ownership, which isn't suited for this class.
2015-09-06 13:45:08 -04:00