Lectem
501e23ce59
refactor APT service to use the new IPC helpers
2017-03-18 10:44:01 +01:00
wwylele
560884336f
citra-qt: remove dead code
2017-03-17 21:45:29 +02:00
wwylele
5245c86f26
citra-qt: release all buttons when render window focus is lost
...
credit to @Hawkheart for the original idea
2017-03-17 21:41:25 +02:00
bunnei
423ab5e2bc
Merge pull request #2497 from wwylele/input-2
...
Refactor input emulation & add SDL gamepad support
2017-03-17 14:59:39 -04:00
bunnei
3e7459bbf9
Merge pull request #2618 from wwylele/log-less-filename
...
Reduce host file name and path logging
2017-03-16 23:35:36 -04:00
bunnei
709e4fa5d2
Merge pull request #2620 from FernandoS27/syscore_error
...
Refined thread launch on syscore error messages
2017-03-15 21:17:43 -04:00
bunnei
b8332610e6
Merge pull request #2625 from wwylele/hash-console-unique
...
cfg: correctly implement GenHashConsoleUnique
2017-03-15 21:07:54 -04:00
Yuri Kunde Schlesner
6ca816e011
common/cpu_detect: Add missing include and fix namespace scope
2017-03-12 21:55:15 -07:00
wwylele
363f36b904
cfg: implement GenHashConsoleUnique
2017-03-12 12:24:57 +02:00
wwylele
d040a73bed
file_util: Log when using local user directory
2017-03-11 18:31:17 +02:00
Fernando Sahmkow
b5dbc6cb98
Refined thread launch on syscore error messages
2017-03-09 08:18:18 -05:00
wwylele
047a1586fe
file_sys: lower log level for setting host path
2017-03-08 17:47:24 +02:00
wwylele
7cd6cc0fd9
file_util: lower logging level for harmless cases
2017-03-08 17:42:10 +02:00
wwylele
6551a72ec8
loader/ncch: less verbose log for loading game list. only log program ID when booting
2017-03-08 17:37:24 +02:00
wwylele
4b931bb913
loader: lower file name logging level
2017-03-08 17:25:09 +02:00
wwylele
b5faa68120
qt/config_input: don't connect for null button
2017-03-02 13:29:28 +02:00
wwylele
5a692ddaec
citra: update default ini with new input system
2017-03-01 23:30:57 +02:00
wwylele
e02c4b7195
Input: remove unused stuff & clean up
...
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID
2. removed button handling in EmuWindow
3. removed key_map
4. cleanup #include
2017-03-01 23:30:57 +02:00
wwylele
e7a602fe16
Qt: rework input configuration for new input system
2017-03-01 23:30:57 +02:00
wwylele
51b1c1f211
InputCommon: add SDL joystick support
2017-03-01 23:30:57 +02:00
wwylele
a6bd7917cb
InputCommon: add AnalogFromButton
2017-03-01 23:30:57 +02:00
wwylele
38e800f70d
InputCommon: add Keyboard
2017-03-01 23:30:57 +02:00
wwylele
70420272ca
HID: use AnalogDevice
2017-03-01 23:30:57 +02:00
wwylele
1d1329af23
HID: use ButtonDevice
2017-03-01 23:30:57 +02:00
wwylele
3974895e08
Input: add device and factory template
2017-03-01 23:30:57 +02:00
wwylele
8a8c0f348b
Common: add ParamPackage
2017-03-01 23:30:57 +02:00
wwylele
85ba60d5ec
Timer: restore missing signaled=true from #2421
2017-02-27 22:49:46 +02:00
bunnei
5e334af369
Merge pull request #2594 from wwylele/ir-separate
...
IR: separate functions of each port to their own files
2017-02-27 14:25:50 -05:00
B3n30
dcf115778a
Fix log entry in timer::signal ( #2600 )
2017-02-27 11:04:03 -05:00
Mat M
0cb52ee74a
Doxygen: Amend minor issues ( #2593 )
...
Corrects a few issues with regards to Doxygen documentation, for example:
- Incorrect parameter referencing.
- Missing @param tags.
- Typos in @param tags.
and a few minor other issues.
2017-02-26 17:58:51 -08:00
Yuri Kunde Schlesner
b250ce21b9
Merge pull request #2587 from yuriks/status-bar
...
Replace built-in Profiler with indicators in status bar
2017-02-26 17:51:15 -08:00
Yuri Kunde Schlesner
174464a87f
PerfStats: Re-order and document members better
2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
1469b3212b
Qt: Tweak status bar styling
2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
915d69ac4c
Qt: Increase status bar update interval to 2 seconds
2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
fb1979d7e2
Core: Re-write frame limiter
...
Now based on std::chrono, and also works in terms of emulated time
instead of frames, so we can in the future frame-limit even when the
display is disabled, etc.
The frame limiter can also be enabled along with v-sync now, which
should be useful for those with displays running at more than 60 Hz.
2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
b285c2a4ed
Core: Make PerfStats internally locked
...
More ergonomic to use and will be required for upcoming changes.
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
f273959205
Qt: Add tooltips to status bar displays
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
008c709dbf
Qt: Don't show fractional figures in the status bar
...
They're not very important and this makes the display changes less
often, making it less distracting.
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
3b4e400333
Remove built-in (non-Microprofile) profiler
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
92c8bd4b1f
PerfStats: Add method to get the instantaneous time ratio
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
c75ae6c585
Add performance statistics to status bar
2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
21f4f49c7a
SynchronizedWrapper: Add Lock convenience method
2017-02-26 17:22:02 -08:00
Yuri Kunde Schlesner
1b28b26682
Qt: Add (empty) status bar
2017-02-26 17:22:02 -08:00
Yuri Kunde Schlesner
441f8b5a4b
Core: Remove unnecessary include in thread.h
2017-02-26 17:22:01 -08:00
wwylele
2d6113de09
IR: separate functions of each port to their own files
2017-02-26 11:11:35 +02:00
bunnei
892888ed9e
Merge pull request #2569 from wwylele/wrap-unwrap
...
APT: implemented Wrap and Unwrap
2017-02-25 00:12:33 -05:00
Yuri Kunde Schlesner
fb5301cf6e
Merge pull request #2421 from Subv/timers
...
Timers: Immediately signal the timer if it was started with an initial value of 0
2017-02-24 20:48:31 -08:00
James Rowe
26823cd38b
Use QFileSystemWatcher to reload the game list when a change is detected. ( #2555 )
...
* Added a refresh game directory option to the file menu
* Make the game list watcher recursive and have it start watching from the initial load
* Rework game list watcher to be thread safe
* Fix code style issues
2017-02-23 16:29:00 -05:00
bunnei
4dee08b343
Merge pull request #2441 from jroweboy/titlebar
...
Gui: Change title bar to include build name
2017-02-23 16:24:48 -05:00
SonofUgly
e0a4450bbd
Add custom layout settings.
2017-02-23 10:49:56 -08:00
James Rowe
b090422991
Gui: Change title bar to include build name
...
Nightly builds now have "Citra Nightly" in the titlebar
Bleeding edge builds now have "Citra Bleeding Edge" in the titlebar
2017-02-23 00:42:55 -07:00
Anthony
a7360f2642
[UI] Modify recursive scanning label ( #2589 )
2017-02-22 21:45:03 -08:00
Subv
0be77c3ae4
Timers: Return an error when calling SetTimer with negative timeouts.
2017-02-21 20:51:56 -05:00
Subv
029a11030e
Timers: Immediately signal the timer if it was started with an initial value of 0.
2017-02-21 20:51:54 -05:00
wwylele
d5b0e275e3
APT: implement Wrap and Unwrap
2017-02-21 23:57:31 +02:00
wwylele
ea1ea0224c
HW: add AES engine & implement AES-CCM
2017-02-21 23:57:31 +02:00
bunnei
bb448ae66f
Merge pull request #2585 from MerryMage/sxtb16-sxtab16
...
dyncom: Correct SXTAB16 and SXTB16
2017-02-19 22:45:46 -05:00
Yuri Kunde Schlesner
7628f3a6fc
Merge pull request #2580 from yuriks/qt-cleanup2
...
Qt cleanups 2
2017-02-19 12:13:52 -08:00
MerryMage
b125388152
dyncom: Correct SXTAB16 and SXTB16
2017-02-18 20:04:54 +00:00
Jannik Vogel
e594e63bb5
OpenGL: Check if uniform block exists before updating it ( #2581 )
2017-02-18 11:46:26 -08:00
Yuri Kunde Schlesner
80762583c2
Qt: Move some connections from .ui file to code
2017-02-18 02:30:29 -08:00
Yuri Kunde Schlesner
5b96915c69
Qt: Reorganize connection of menu events
2017-02-18 02:26:57 -08:00
Yuri Kunde Schlesner
4cb1f36896
Qt: Re-organize setup of debugging widgets
2017-02-18 02:16:24 -08:00
Yuri Kunde Schlesner
e823c908ea
Qt: Fix action name to match conventions
2017-02-18 01:11:57 -08:00
Yuri Kunde Schlesner
cef18c94e2
Qt: Make IsSingleFileDropEvent static
2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
c81a2aabbf
Qt: Allow any file extension in Open dialog
2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
c7c0219f8a
Qt: Remove orpahned function declaration
2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
5f00fe905c
Qt: Remove unnecessary std::string usage
2017-02-17 21:44:00 -08:00
Weiyi Wang
c7c1f56ce6
HID: move enable_accelerometer/gyroscope_count initialization into Init() ( #2574 )
...
Fixes #2556
2017-02-16 22:04:27 -08:00
noah the goodra
6bcd5ce047
added drag n drop feature
2017-02-16 14:43:18 -06:00
Mat M
5472528202
Merge pull request #2571 from wwylele/missing-file
...
core: add missing errors.h in CMakeLists.txt
2017-02-15 11:19:06 -05:00
wwylele
e4da1a54cf
core: add missing errors.h in CMakeLists.txt
2017-02-15 15:49:07 +02:00
Weiyi Wang
e085e6a768
video_core: remove #pragma once in cpp file ( #2570 )
2017-02-15 00:16:50 -08:00
Weiyi Wang
fae1efaad4
Merge pull request #2566 from yuriks/file-extension-suffix
...
Qt/GameList: Use suffix() to parse the file extension
2017-02-14 09:04:59 +02:00
Yuri Kunde Schlesner
070daf4126
HLE/IPC: Fix uninitialized variables in helpers ( #2568 )
...
Fixes #2567
2017-02-13 21:41:59 -08:00
Yuri Kunde Schlesner
f75e964d49
Qt/GameList: Use suffix() to parse the file extension
...
completeSuffix returns everything after the first period, which means
that a file such as `foo.bar.3ds` would not get recognized.
2017-02-13 19:03:59 -08:00
noah the goodra
091dd226d6
applied the change suggested by @wwylele
2017-02-13 18:34:02 -06:00
noah the goodra
ded09dc727
NWM changed to NIM
2017-02-13 18:34:01 -06:00
noah the goodra
ad49cec194
turned clang format back on
2017-02-13 18:34:01 -06:00
noah the goodra
1a84bce0f4
added http service enum to the log.h file
2017-02-13 18:34:01 -06:00
Yuri Kunde Schlesner
1bf449d752
Merge pull request #2562 from yuriks/pica-refactor3
...
Re-organize software rasterizer code
2017-02-13 12:04:17 -08:00
Weiyi Wang
dbc94efdb5
Core: add cryptopp library ( #2412 )
2017-02-13 12:03:55 -08:00
Yuri Kunde Schlesner
d60767d393
Merge pull request #2561 from wwylele/fs-rom
...
file_sys: change RomFS archive to Self NCCH archive
2017-02-13 09:18:23 -08:00
wwylele
20544977da
loader: use self NCCH archive
2017-02-13 13:57:38 +02:00
wwylele
a0df747325
file_sys: add Self NCCH archive
2017-02-13 13:57:38 +02:00
Yuri Kunde Schlesner
426fda1d52
SWRasterizer: Move more framebuffer functions to file
2017-02-12 18:13:04 -08:00
Yuri Kunde Schlesner
1683cb0ec9
SWRasterizer: Move texturing functions to their own file
2017-02-12 18:12:37 -08:00
Yuri Kunde Schlesner
f9026e8a7a
SWRasterizer: Convert large no-capture lambdas to standalone functions
2017-02-12 18:11:05 -08:00
Yuri Kunde Schlesner
e1ad7d69b9
SWRasterizer: Move framebuffer operation functions to their own file
2017-02-12 18:11:03 -08:00
Yuri Kunde Schlesner
e24717bca0
VideoCore: Move software rasterizer files to sub-directory
2017-02-12 18:08:11 -08:00
Yuri Kunde Schlesner
e10b11a5d0
video_core/shader: Document sanitized MUL operation
2017-02-12 13:29:14 -08:00
Yuri Kunde Schlesner
443bb3d522
Merge pull request #2550 from yuriks/pica-refactor2
...
Small VideoCore cleanups
2017-02-12 12:33:26 -08:00
Kloen Lansfiel
30ff675f02
citra-qt: Don't attempt to scan files with unsupported extensions ( #2402 )
2017-02-12 12:28:56 -08:00
Yuri Kunde Schlesner
da6a40e3d1
core: Free AppLoader on shutdown to release file ( #2558 )
...
Fixes #2455
2017-02-11 03:29:46 -08:00
Weiyi Wang
0dd007e9ba
hid: remove the touch field from PadState ( #2557 )
2017-02-11 01:11:42 -08:00
Yuri Kunde Schlesner
e2fa1ca5e1
video_core: Fix benign out-of-bounds indexing of array ( #2553 )
...
The resulting pointer wasn't written to unless the index was verified as
valid, but that's still UB and triggered debug checks in MSVC.
Reported by garrettboast on IRC
2017-02-10 20:51:09 -08:00
Yuri Kunde Schlesner
553e672777
VideoCore: Split u64 Pica reg unions into 2 separate u32 unions
...
This eliminates UB when aliasing it with the array of u32 regs, and
is compatible with non-LE architectures.
2017-02-09 00:04:25 -08:00
Yuri Kunde Schlesner
bfb1531352
VideoCore: Force enum sizes to u32 in LightingRegs
...
All enums that are used with BitField must have their type forced to u32
to ensure correctness.
2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
af65e1c0a0
OpenGL: Remove unused duplicate of IsPassThroughTevStage
...
This copy was left behind when the shader generation code was moved to a
separate file.
2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
60fc0b086f
VideoCore: Split regs.h inclusions
2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
f241bb72f5
Pica/Regs: Use binary search to look up reg names
...
This gets rid of the static unordered_map. Also changes the return type
const char*, avoiding unnecessary allocations (the result was only used
by calling .c_str() on it.)
2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
602f57da38
VideoCore: Use union to index into Regs struct
...
Also remove some unused members.
2017-02-08 22:13:25 -08:00
Yuri Kunde Schlesner
2889372e47
Merge pull request #2482 from yuriks/pica-refactor
...
Split up monolithic Regs struct
2017-02-08 22:07:34 -08:00
Lectem
f146a6d45a
Use std::array<u8,2> instead of u8[2] to fix MSVC build
2017-02-05 14:55:51 +01:00
Weiyi Wang
a1393dc70c
Merge pull request #2027 from Lectem/ipcrefactor
...
IPC helper
2017-02-05 10:22:13 +02:00
Lectem
2ee472b9c7
fix wwylele's comment and use typename in templates
2017-02-05 00:29:07 +01:00
Yuri Kunde Schlesner
5759d94b5c
VideoCore: Move Regs to its own file
2017-02-04 13:59:12 -08:00
Yuri Kunde Schlesner
f7c7f422c6
VideoCore: Split shader regs from Regs struct
2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
8fca90b5d5
VideoCore: Split geometry pipeline regs from Regs struct
2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
f443c7e5b0
VideoCore: Split lighting regs from Regs struct
2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
23713d5dee
VideoCore: Split framebuffer regs from Regs struct
2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
9017093f58
VideoCore: Split texturing regs from Regs struct
2017-02-04 13:59:09 -08:00
Yuri Kunde Schlesner
000e78144c
VideoCore: Split rasterizer regs from Regs struct
2017-02-04 13:08:47 -08:00
Yuri Kunde Schlesner
97e06b0a0d
Merge pull request #2476 from yuriks/shader-refactor3
...
Oh No! More shader changes!
2017-02-04 13:02:48 -08:00
Yuri Kunde Schlesner
c74787a11c
Pica/Texture: Move part of ETC1 decoding to new file and cleanups
2017-02-04 12:33:28 -08:00
Yuri Kunde Schlesner
09a750e866
Pica/Texture: Simplify/cleanup texture tile addressing
2017-02-04 12:33:25 -08:00
Yuri Kunde Schlesner
a1c9ac7845
VideoCore: Move LookupTexture out of debug_utils.h
2017-02-04 12:31:40 -08:00
Yuri Kunde Schlesner
9590c932ec
Merge pull request #2496 from mailwl/cfg-mem
...
Core: update Kernel Config Memory to latest version (11.2)
2017-02-03 21:17:48 -08:00
Yuri Kunde Schlesner
ba7cdce46d
Merge pull request #2520 from wwylele/shader-stack-boundary
...
ShaderJIT: add 16 dummy bytes at the bottom of the stack
2017-02-03 18:56:42 -08:00
Yuri Kunde Schlesner
a630fa287e
Merge pull request #2518 from MerryMage/coproc
...
arm_dynarmic: Coprocessor support
2017-02-03 18:22:28 -08:00
bunnei
632562f5cf
Merge pull request #2509 from jfmherokiller/settingscastpatch
...
removed the possibly uneeded cast on values.gdbstub_port
2017-02-03 14:57:44 -05:00
bunnei
c330dcd3fd
Merge pull request #2507 from jfmherokiller/keyidchange
...
removal of the -1 case in the configure_input switch
2017-02-03 14:56:55 -05:00
MerryMage
e2815408fd
arm_dynarmic: Update memory interface
2017-02-03 17:32:51 +00:00
MerryMage
2b36d4c9d7
arm_dynarmic: CP15 support
2017-02-03 17:32:47 +00:00
wwylele
6dc1d6e568
ShaderJIT: add 16 dummy bytes at the bottom of the stack
2017-02-03 14:53:38 +02:00
mailwl
a53714acd3
GSP_GPU::StoreDataCache stubbed ( #2428 )
2017-02-02 23:07:44 -08:00
noah the goodra
a0874d9b64
removed the possibly uneeded cast on values.gdbstub_port
...
as far as i could tell this cast is unneeded because [GDBStub::SetServerPort](https://github.com/citra-emu/citra/blob/master/src/core/gdbstub/gdbstub.cpp#L897 ) takes a u16 and [values.gdbstub_port](https://github.com/citra-emu/citra/blob/master/src/core/settings.h#L116 ) is already a u16
2017-01-31 11:44:23 -06:00
noah the goodra
6c41d87a9d
removal of the -1 case in the configure_input switch
...
this case is unneeded because no enumeration value can possibly correspond to it
2017-01-31 09:55:56 -06:00
mailwl
d0bf7df5ba
HLE/Applets: Stub Mint (eShop) Applet ( #2463 )
...
This allows Phoenix Wright - Dual Destinies to boot.
2017-01-31 01:16:58 -08:00
Weiyi Wang
0b9c59ff22
Common/x64: remove legacy emitter and abi ( #2504 )
...
These are not used any more since we moved shader JIT to xbyak.
2017-01-31 01:06:42 -08:00
Merry
f7e96dc068
shader_jit_x64_compiler: esi and edi should be persistent ( #2500 )
2017-01-31 00:38:31 -08:00
noah the goodra
a2d0e2d807
file_util: Fixed implicit type conversion warning ( #2503 )
2017-01-30 20:08:00 -08:00
mailwl
0b0c5672c8
Core: update Kernel Config Memory to latest version (11.2)
2017-01-30 11:29:00 +03:00
Jake Merdich
ff28080091
Support looping HLE audio ( #2422 )
...
* Support looping HLE audio
* DSP: Fix dirty bit clears, handle nonmonotonically incrementing IDs
* DSP: Add start offset support
2017-01-29 23:52:25 -08:00
Yuri Kunde Schlesner
1410aa1824
Merge pull request #2368 from wwylele/camera-2
...
CAM: build the service framework with a dummy implementation
2017-01-29 22:16:39 -08:00
Yuri Kunde Schlesner
a925473995
Merge pull request #2429 from wwylele/auto-language-fix
...
CFG: move language override to the boot process
2017-01-29 22:14:35 -08:00
Yuri Kunde Schlesner
37a4ea046d
VideoCore: Make PrimitiveAssembler const-correct
2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
dcdffabfe6
VideoCore: Extract swrast-specific data from OutputVertex
2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
8ed9f9d49f
VideoCore/Shader: Clean up OutputVertex::FromAttributeBuffer
...
This also fixes a long-standing but neverthless harmless memory
corruption bug, whech the padding of the OutputVertex struct would get
corrupted by unused attributes.
2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
d36ec905b1
Common: Optimize BitSet iterator
2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
92bf5c88e6
VideoCore: Split shader output writing from semantic loading
2017-01-29 21:31:37 -08:00
Yuri Kunde Schlesner
335df895b9
VideoCore: Consistently use shader configuration to load attributes
2017-01-29 21:31:37 -08:00
Yuri Kunde Schlesner
fccb28d2e9
VideoCore: Use correct register for immediate mode attribute count
2017-01-29 21:31:36 -08:00
Yuri Kunde Schlesner
ab6954e942
VideoCore: Rename some types to more accurate names
2017-01-29 21:31:36 -08:00
Yuri Kunde Schlesner
bbc7844021
VideoCore: Change misleading register names
...
A few registers had names such as "count" or "number" when they actually
contained the maximum (that is, count - 1). This can easily lead to hard
to notice off by one errors.
2017-01-29 21:31:36 -08:00
Kloen
eee37b857b
video_core: gl_rasterizer_cache.cpp removed unused type alias
2017-01-30 05:18:28 +01:00
Kloen
6a3a3964b0
video_core: gl_rasterizer.cpp removed unused type alias
2017-01-30 05:16:48 +01:00
Yuri Kunde Schlesner
5bb6753f2e
Merge pull request #2494 from Kloen/killing-warnings-2-final-mix
...
core: inline CPU, 132 warnings fixed on GCC
2017-01-29 15:40:50 -08:00
Yuri Kunde Schlesner
f111cd66ce
Merge pull request #2492 from Kloen/killing-warnings-HD1.5ReMIX
...
Fix OSX build warnings about unhandled enumeration values.
2017-01-29 15:38:49 -08:00
Yuri Kunde Schlesner
1016e31fc7
Merge pull request #2493 from Kloen/killing-warnings-final-mix
...
video_core: silence unused-local-typedef boost related warnings on GCC
2017-01-29 15:35:59 -08:00
Kloen
b3a0b1489b
core: inline CPU, 132 warnings fixed on GCC
2017-01-30 00:12:07 +01:00
Kloen
28da285031
citra: add missing control paths for ResultStatus on rom load. Fix warning about unhandled enumeration values on OSX
2017-01-29 22:02:01 +01:00
Kloen
2ca3beb9d3
core: fix err_f.cpp warning about unhandled enumeration value on OSX
2017-01-29 22:01:19 +01:00
Kloen
f352a741d3
core: fix savedata_archive.cpp warnings about unhandled enumeration values on OSX
2017-01-29 21:50:25 +01:00
Kloen
c4f9cd3559
core: fix archive_sdmc.cpp warnings about unhandled enumeration value on OSX
2017-01-29 21:49:36 +01:00
Kloen
f14a53abd0
core: fix archive_extsavedata.cpp warning on OSX
2017-01-29 21:48:40 +01:00
Kloen
4652d70572
video_core: silence unused-local-typedef boost related warning on GCC
2017-01-29 21:24:24 +01:00
Kloen
ff7d68d743
core: emu_window.cpp, fix conversion warnings from float to s16 on MSVC
2017-01-29 16:39:31 +01:00
Kloen
818b1730a9
common: add <cstddef> to hash.h
2017-01-28 15:30:18 +01:00
Kloen
2fa0971ceb
common: switch ComputeHash64 len param to size_t instead of int, fix warning on MSVC on dsp_dsp.cpp
2017-01-28 14:47:14 +01:00
noah the goodra
3545b144f1
fixed the override warning
...
```
In file included from citra/src/audio_core/sink_details.cpp:11:
citra/src/./audio_core/sdl2_sink.h:25:10: warning: 'SetDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
void SetDevice(int device_id);
^
citra/src/./audio_core/sink.h:39:18: note: overridden virtual function is here
virtual void SetDevice(int device_id) = 0;
^
```
2017-01-27 14:24:14 -06:00
Yuri Kunde Schlesner
bf14f4be22
Merge pull request #2346 from yuriks/shader-refactor2
...
More shader refactoring
2017-01-27 14:29:10 -03:00
Kloen Lansfiel
f852369986
SDL: Select audio device ( #2403 )
...
* Initial Commit
Added Device logic to Sinks
Started on UI for selecting devices
Removed redundant import
* Audio Core: Complete Device Switching
Complete the device switching implementation by allowing the output
device to be loaded, changed and saved through the configurations menu.
Worked with the Sink abstraction and tuned the "Device Selection"
configuration so that the Device List is automatically populated when
the Sink is changed.
This hopefully addresses the concerns and recommendations mentioned in
the comments of the PR.
* Clean original implementation.
* Refactor GetSinkDetails
2017-01-25 22:33:26 -05:00
Yuri Kunde Schlesner
0e9081b973
VideoCore/Shader: Move entry_point to SetupBatch
2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner
0f64274145
VideoCore/Shader: Move per-batch ShaderEngine state into ShaderSetup
2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner
6fa3687afc
Shader: Remove OutputRegisters struct
2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner
9ea5eacf91
Shader: Initialize conditional_code in interpreter
...
This doesn't belong in LoadInputVertex because it also happens for
non-VS invocations. Since it's not used by the JIT it seems adequate to
initialize it in the interpreter which is the only thing that cares
about them.
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
1a2acc3baa
Shader: Don't read ShaderSetup from global state
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
fa4ac279a7
shader_jit_x64: Don't read program from global state
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
ade7ed7c5f
VideoCore/Shader: Move ProduceDebugInfo to InterpreterEngine
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
a9b7752b9d
Debugger: Always use interpreter for shader debugging
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
114d6b2f97
VideoCore/Shader: Split interpreter and JIT into separate ShaderEngines
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner
8eefc62833
VideoCore/Shader: Rename shader_jit_x64{ => _compiler}.{cpp,h}
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner
dd4a1672a7
VideoCore/Shader: Split shader uniform state and shader engine
...
Currently there's only a single dummy implementation, which will be
split in a following commit.
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner
bd82cffd0b
VideoCore/Shader: Add constness to methods
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner
1e1f939817
VideoCore/Shader: Use only entry_point as ShaderSetup param
...
This removes all implicit dependency of ShaderState on global PICA
state.
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner
e3caf669b0
VideoCore/Shader: Use self instead of g_state.vs in ShaderSetup
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner
34d581f2dc
VideoCore/Shader: Extract input vertex loading code into function
2017-01-25 18:53:20 -08:00
Yuri Kunde Schlesner
3feb3ce283
Merge pull request #2434 from mailwl/nfc-amiibo
...
Service/NFC: stub some functions
2017-01-25 23:47:56 -03:00
Kloen
5cc94c17f6
video_core: fix shader.cpp signed / unsigned warning
2017-01-23 16:53:31 +01:00
Kloen
753fea5d65
video_core: gl_rasterizer float to int warning
2017-01-23 16:53:30 +01:00
Kloen
b6063d9a93
video_core: fix gl_rasterizer warning on MSVC
2017-01-23 16:53:30 +01:00
Kloen
095f7c83fc
core: fix mic_u warnings on MSVC
2017-01-23 16:53:05 +01:00
Kloen
abc5c134a3
Removed unused and outdated external qhexedit
2017-01-22 18:46:48 +01:00
Kloen
380c165339
citra-qt: Removed unused and unimplemented ramview files.
2017-01-22 18:42:15 +01:00
wwylele
2c7676d371
HID: reset acceleroeter and gyroscope index in Init
2017-01-20 23:33:50 +02:00
wwylele
0045ea662f
CFG: override language setting on boot
2017-01-19 10:28:35 +02:00
Thomas Farr
bb1f277db1
loader: Add support for 3DSX special relocation types, fixes citra-emu/citra#2449
...
As per devkitPro/3dstools@47bea18
2017-01-19 01:34:58 +13:00
wwylele
47960b0659
CoreTiming: use named constant for ARM11 clock rate
2017-01-16 09:59:16 +02:00
wwylele
3c333c53f1
HID: manages updating itself using correct ticks
2017-01-16 09:51:44 +02:00
mailwl
efe7e245b2
Service/NFC: stub some functions
...
Tested on: Mini-Mario & Friends - amiibo Challenge
2017-01-14 16:15:16 +03:00
mailwl
b458d7447c
GSP::WriteHWRegsWithMask: fix register mask
2017-01-14 13:37:04 +03:00
bunnei
ba271f6569
Merge pull request #2423 from Kloen/floats-should-be-float
...
SDL2: Config, fix double to float warning
2017-01-13 12:04:27 -05:00
bunnei
1d088c637c
Merge pull request #2424 from Kloen/qt-ui-warnings-really
...
Qt: Fix UI related warnings and bonus ui file format
2017-01-12 10:15:12 -05:00
bunnei
7ddfd3054d
Merge pull request #2425 from Subv/cleanup_todos
...
Implement some TODOs in the code.
2017-01-12 10:14:30 -05:00
bunnei
597a7c615c
Merge pull request #2308 from mailwl/ac-i
...
Service/AC: add ac:i service
2017-01-12 10:12:46 -05:00
Subv
1ddff14511
Threads: Check the process' resource limit for the max allowed priority when creating a thread and remove the priority clamping code.
2017-01-11 16:38:05 -05:00
Subv
f2f2572fed
Thread: Added priority range checking to svcSetThreadPriority and removed priority clamping code from Thread::SetPriority.
2017-01-11 16:38:04 -05:00
Subv
5ddc2e09b1
Y2R: Use the proper error code when GetStandardCoefficient receives an invalid value.
2017-01-11 16:38:03 -05:00
Kloen
8d48798f1c
QT: Fix ui file format
2017-01-11 13:52:26 +01:00
Kloen
551fe3dd69
QT: Fix some UI related warnings
2017-01-11 13:52:01 +01:00
Kloen
a851aa4cf1
SDL2: Config.cpp fix double to float warning
2017-01-11 13:32:02 +01:00
wwylele
cf3a272332
CAM: implement basic camera functions with a blank camera
2017-01-11 11:46:44 +02:00
bunnei
84d72fd92f
Merge pull request #2397 from Subv/pulse
...
Kernel: Implemented Pulse event and timers.
2017-01-10 10:45:00 -05:00
bunnei
9fc8ead842
Merge pull request #2384 from bunnei/internal-res-option
...
config: Add option for specifying screen resolution scale factor.
2017-01-08 12:25:12 -05:00
bunnei
7cfe3ef046
Merge pull request #1951 from wwylele/motion-sensor
...
Emulate motion sensor in frontend
2017-01-07 12:39:20 -05:00
bunnei
22ad9094e6
config: Add option for specifying screen resolution scale factor.
2017-01-07 03:23:22 -05:00
bunnei
b5eac78b43
Merge pull request #2410 from Subv/sleepthread
...
Don't yield execution in SleepThread(0) if there are no available threads to run
2017-01-06 22:01:33 -05:00
bunnei
59f4f1d7ff
Merge pull request #2396 from Subv/sema_acquire
...
Kernel/Semaphore: Fixed a regression in semaphore waits.
2017-01-06 22:00:12 -05:00
Hyper
f0199a17f6
Kernel: Fix SharedMemory objects always returning error when addr = 0 ( #2404 )
...
Closes #2400
2017-01-06 08:21:22 -05:00
bunnei
1c792389e6
Merge pull request #2408 from Subv/priority_boosting
...
Kernel: Removed the priority boost code for starved threads.
2017-01-06 00:40:39 -05:00
Subv
fc2266130b
Kernel: Don't attempt to yield execution in SleepThread(0) if there are no available threads to run.
...
With this we avoid an useless temporary deschedule of the current thread.
2017-01-05 19:11:34 -05:00
Subv
5e2a8ebabf
Kernel: Remove some unused functions.
2017-01-05 13:17:06 -05:00
Subv
933df2606a
Kernel: Removed the priority boost code for starved threads.
...
After hwtesting and reverse engineering the kernel, it was found that the CTROS scheduler performs no priority boosting for threads like this, although some other forms of scheduling priority-starved threads might take place.
For example, it was found that hardware interrupts might cause low-priority threads to run if the CPU is preempted in the middle of an SVC handler that deschedules the current (high priority) thread before scheduling it again.
2017-01-05 13:12:39 -05:00
Subv
e52ca85711
Kernel: Implemented Pulse event and timers.
...
Closes #1904
2017-01-05 13:06:17 -05:00
Subv
4251eb26ec
Kernel/Semaphore: Fixed a regression in semaphore waits.
...
The regression was caused by a missing check in #2260 .
The new behavior is consistent with the real kernel.
2017-01-05 13:00:05 -05:00
Sebastian Valle
f20d872643
Merge pull request #2393 from Subv/synch
...
Kernel: Mutex priority inheritance and synchronization improvements.
2017-01-05 12:55:01 -05:00
Subv
dda4ec93be
Kernel: Add some asserts to enforce the invariants in the scheduler.
2017-01-05 09:40:18 -05:00
Subv
7f1dca8cd2
Kernel: Remove a thread from all of its waiting objects' waiting_threads list when it is awoken.
...
This fixes a potential bug where threads would not get removed from said list if they awoke after waiting with WaitSynchronizationN with wait_all = false
2017-01-05 09:40:15 -05:00
Subv
fd95b6ee26
Kernel: Remove Thread::wait_objects_index and use wait_objects to hold all the objects that a thread is waiting on.
2017-01-05 09:40:14 -05:00
Subv
cef5f45de2
Kernel: Use different thread statuses when a thread calls WaitSynchronization1 and WaitSynchronizationN with wait_all = true.
...
This commit removes the overly general THREADSTATUS_WAIT_SYNCH and replaces it with two more granular statuses:
THREADSTATUS_WAIT_SYNCH_ANY when a thread waits on objects via WaitSynchronization1 or WaitSynchronizationN with wait_all = false.
THREADSTATUS_WAIT_SYNCH_ALL when a thread waits on objects via WaitSynchronizationN with wait_all = true.
2017-01-04 15:58:50 -05:00
Subv
d3ff5b91e1
Kernel/Mutex: Propagate thread priority changes to other threads inheriting the priority via mutexes
2017-01-04 15:58:48 -05:00
Subv
b6a0355568
Kernel/Mutex: Update a mutex priority when a thread stops waiting on it.
2017-01-04 15:58:47 -05:00
Subv
7abf185390
Kernel/Mutex: Implemented priority inheritance.
...
The implementation is based on reverse engineering of the 3DS's kernel.
A mutex holder's priority will be temporarily boosted to the best priority among any threads that want to acquire any of its held mutexes.
When the holder releases the mutex, it's priority will be boosted to the best priority among the threads that want to acquire any of its remaining held mutexes.
2017-01-04 15:58:46 -05:00
Subv
e6a7723f2f
Kernel: Object ShouldWait and Acquire calls now take a thread as a parameter.
...
This will be useful when implementing mutex priority inheritance.
2017-01-04 15:58:45 -05:00
Subv
38a90882a4
Kernel/Synch: Do not attempt a reschedule on every syscall.
...
Not all syscalls should cause reschedules, this commit attempts to remedy that, however, it still does not cover all cases.
2017-01-04 15:58:44 -05:00
Jonathan Hao
c18cb1b192
Fix some warnings ( #2399 )
2017-01-04 13:48:29 -03:00
Yuri Kunde Schlesner
e2de82543b
Merge pull request #2382 from mailwl/nfc
...
Service/NFC: stub GetTagInRangeEvent
2017-01-03 12:56:02 -03:00
Lectem
ee6e88fdb5
fix comments alignment
2016-12-30 15:55:42 +01:00
Sebastian Valle
f7dd8d5e81
Merge pull request #2386 from bunnei/fix-bg-color
...
config: SDL: Move background color setting to correct section.
2016-12-30 09:51:56 -05:00
mailwl
f2985f7080
Service/NFC: stub GetTagInRangeEvent
...
Fix Fatal Error in Mini-Mario & Friends - amiibo Challenge
2016-12-30 09:40:54 +03:00
mailwl
c6f4b93f2e
Service/AC: add ac:i service
2016-12-30 09:20:11 +03:00
bunnei
02b4b2ed6e
config: SDL: Move background color setting to correct section.
2016-12-30 00:35:38 -05:00
bunnei
f556d6ee90
Merge pull request #2240 from wwylele/auto-region
...
Config: auto-select region and language
2016-12-29 22:09:01 -05:00
wwylele
d7d40b3c56
Frontend: make motion sensor interfaced thread-safe
2016-12-29 21:18:36 +02:00
bunnei
2f746e9946
Merge pull request #2367 from JayFoxRox/lighting-lut-quickfix
...
Lighting LUT Quickfix
2016-12-29 13:41:51 -05:00
wwylele
f927beb5e2
Core: remove unused hle.cpp
2016-12-27 10:27:48 +02:00
Lectem
f91c51467a
move Pop methods out of class body
2016-12-26 14:42:06 +01:00
Lectem
8baae9d982
IPC helpers example
2016-12-26 14:07:29 +01:00
Lectem
8f2b642415
IPC helpers
2016-12-26 14:07:29 +01:00
wwylele
bcf9d20d57
Frontend: emulate motion sensor
2016-12-26 10:52:16 +02:00
wwylele
6479f63091
Common: add Quaternion
2016-12-26 10:41:26 +02:00
wwylele
2e6d8e1321
vector math: add implementation of Length and Normalize
2016-12-26 10:41:26 +02:00
wwylele
55f5d0f777
MathUtil: add PI constant
2016-12-26 10:41:26 +02:00
wwylele
2a069e76a5
Common::Event: add WaitUntil
2016-12-26 10:41:26 +02:00
Jannik Vogel
6ed4206f87
Minor cleanup in GLSL code
2016-12-25 21:38:10 +01:00
Jannik Vogel
88f409aec9
Offset lighting LUT samples correctly
2016-12-25 21:37:26 +01:00
wwylele
fe2ed4bf72
Core: reset cpu_core in Shutdown to make IsPoweredOn work properly
2016-12-24 20:55:38 +02:00
bunnei
51dd13b8a0
Merge pull request #2369 from MerryMage/core-frontend
...
core: Move emu_window and key_map into core
2016-12-23 17:35:35 -05:00
Yuri Kunde Schlesner
56e4066f4f
Merge pull request #2370 from wwylele/where-is-my-shared-font
...
file_util: fix missing sysdata path
2016-12-23 12:42:40 -08:00
wwylele
488b7a4041
file_util: fix missing sysdata path
2016-12-23 22:19:14 +02:00
MerryMage
64f98f4d0f
core: Move emu_window and key_map into core
...
* Removes circular dependences (common should not depend on core)
2016-12-23 13:42:39 +00:00
mailwl
069a88dad7
Service/NWM: add nwm services
2016-12-22 22:51:27 +03:00
bunnei
76890672a0
Merge pull request #2366 from MerryMage/MemoryReadCode
...
arm_dynarmic: Provide MemoryReadCode callback
2016-12-22 14:25:15 -05:00
bunnei
aa47af7fb6
Merge pull request #2343 from bunnei/core-cleanup
...
Core: Top-level consolidate & misc cleanup
2016-12-22 11:47:44 -05:00
MerryMage
f8cf87ce34
arm_dynarmic: Provide MemoryReadCode callback
...
Change of interface in dynarmic 36082087ded632079b16d24137fdd0c450ce82ea
2016-12-22 16:07:14 +00:00
bunnei
17d740299a
Merge pull request #2285 from mailwl/csnd-format
...
csnd:SND: Reformat source code
2016-12-22 00:47:50 -05:00
bunnei
8b1e269e58
ThreadContext: Move from "core" to "arm_interface".
2016-12-22 00:27:49 -05:00
bunnei
e26fbfd1d7
core: Replace "AppCore" nomenclature with just "CPU".
2016-12-22 00:27:46 -05:00
bunnei
7623957f80
Merge pull request #2361 from lioncash/disasm
...
disassembler: Remove mutable specifier from breakpoints member variable
2016-12-22 00:15:06 -05:00
bunnei
5ac5cbeab7
Address clang-format issues.
2016-12-21 23:48:14 -05:00
bunnei
4fc8b8229e
core: Remove HLE module, consolidate code & various cleanups.
2016-12-21 23:48:13 -05:00
bunnei
232ef55c1a
core: Consolidate core and system state, remove system module & cleanups.
2016-12-21 23:29:13 -05:00
bunnei
707cc66362
file_util: Remove unused paths.
2016-12-21 23:29:12 -05:00
bunnei
198b6c9bdd
core: Consolidate top-level system state into a singleton.
2016-12-21 23:29:04 -05:00
bunnei
81e22ae8c7
loader: Remove duplicate docstrings.
2016-12-21 23:27:50 -05:00
Lioncash
8309d0dade
citra-qt: Move graphics debugging code into its own folder
...
Keeps all graphics debugging stuff from cluttering up the root debugger
folder
2016-12-21 17:19:21 -05:00
Lioncash
f2c307557a
disassembler: Remove mutable specifier from breakpoints member variable
...
Breakpoints has been const correct with regards to what the
DisassmblerModel needs for quite a while now.
2016-12-21 14:12:41 -05:00
bunnei
29564d73bd
Merge pull request #2319 from yuriks/profile-scopes
...
VideoCore: Make profiling scope more representative
2016-12-21 13:33:49 -05:00
bunnei
c4491352b3
Merge pull request #2357 from lioncash/ui
...
citra-qt: Move bits of constructor behavior to named functions
2016-12-21 13:33:16 -05:00
Lioncash
cc1f2c131b
citra-qt: Move bits of constructor behavior to named functions
...
Makes the initialization process a tad easier to grok,
since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 15:12:28 -05:00
Albin Bernhardsson
ddec9cb369
Use GL_TRUE when setting color_mask
2016-12-19 19:06:35 +01:00
bunnei
3a1eaf2efc
Merge pull request #2318 from yuriks/trace-opt
...
VideoCore: Inline IsPicaTracing
2016-12-18 21:15:24 -05:00
bunnei
dac86b61ee
Merge pull request #2351 from CaptV0rt3x/master
...
Fixed game_list focus issue.
2016-12-18 16:12:21 -05:00
bunnei
4c45611a2b
Merge pull request #2347 from citra-emu/revert-2321-flush-pages
...
Revert "Memory: Always flush whole pages from surface cache"
2016-12-18 16:11:26 -05:00
CaptV0rt3x
393a0f99da
line fixup for travis ci
2016-12-19 00:52:54 +05:30
Vamsi Krishna
77f4743199
screen swap - Hotkey mapping
2016-12-19 00:49:57 +05:30
Vamsi Krishna
0db22eadd5
Fixed GPLv2 license text in the start.
2016-12-19 00:06:27 +05:30
Vamsi Krishna
27217c621b
Fixed game_list focusing issue.
...
added line render_window->setFocus();
2016-12-18 16:13:51 +05:30
bunnei
4798b1d04d
Revert "Memory: Always flush whole pages from surface cache"
2016-12-17 19:13:33 -05:00
wwylele
5728e42634
Thread: remove the thread from the thread list when exiting
2016-12-17 19:23:52 +02:00
Yuri Kunde Schlesner
2ca548bbe5
Merge pull request #2335 from yuriks/shader-refactor
...
Misc. Shader refactors
2016-12-16 20:45:57 -08:00
bunnei
d30d6f81aa
Merge pull request #2303 from freiro/citra-qt_missing_sdl2_dll
...
Copy SDL2.dll when compiling citra-qt with msvc
2016-12-16 11:35:55 -05:00
bunnei
ca5a8966ac
Merge pull request #2337 from lioncash/gdb
...
gdbstub: const correctness changes
2016-12-16 11:32:33 -05:00
Merry
acc83a1c32
Merge pull request #2322 from MerryMage/ctx-mnu
...
game_list: Add a context menu with "Open Save Location" option
2016-12-16 15:08:04 +00:00
wwylele
4c9b80cee3
Kernel: remove object's waiting thread if it is dead
2016-12-16 12:33:18 +02:00
Lioncash
38a964735f
gdbstub: const correctness changes
...
Also uses size_t as the length indicator type, as is common with buffers.
2016-12-16 04:06:26 -05:00
Yuri Kunde Schlesner
c135317de1
VideoCore/Shader: Extract DebugData out from UnitState
2016-12-16 00:16:25 -08:00
Yuri Kunde Schlesner
6e7e767645
Remove unnecessary cast
2016-12-16 00:15:55 -08:00
Yuri Kunde Schlesner
b5e3599704
VideoCore/Shader: Extract evaluate_condition lambda to function scope
2016-12-16 00:15:51 -08:00
Yuri Kunde Schlesner
960578f4e1
VideoCore/Shader: Extract call lambda up a scope and remove unused param
2016-12-15 23:08:05 -08:00
Yuri Kunde Schlesner
e4e962bc7c
VideoCore/Shader: Remove dynamic control flow in (Get)UniformOffset
2016-12-15 23:08:05 -08:00
Yuri Kunde Schlesner
d27cb1dedc
VideoCore/Shader: Move DebugData to a separate file
2016-12-15 23:08:05 -08:00
bunnei
cda7210fad
Merge pull request #2260 from Subv/scheduling
...
Threading: Reworked the way our scheduler works.
2016-12-16 00:41:22 -05:00
bunnei
a89471621b
Merge pull request #2316 from endrift/macos-gcc
...
Common: Fix gcc build on macOS
2016-12-16 00:40:40 -05:00
Yuri Kunde Schlesner
2427a5e976
Merge pull request #2328 from wwylele/fix-trace
...
Fix debug build from #2249
2016-12-15 21:06:12 -08:00
Yuri Kunde Schlesner
7524a55133
Merge pull request #2332 from lioncash/gdb
...
gdbstub: Remove global variable from public interface
2016-12-15 21:05:20 -08:00
Yuri Kunde Schlesner
63e8174caa
Merge pull request #2320 from mailwl/cecd-update
...
Service/CECD: Add cecd:ndm service
2016-12-15 21:01:51 -08:00
bunnei
9dc43d3720
Merge pull request #2331 from lioncash/trunc
...
hid: Get rid of a double -> float truncation warning
2016-12-15 17:45:24 -05:00
wwylele
a7cd452ea1
FS: fix debug build from #2249
2016-12-16 00:22:36 +02:00