Commit graph

4930 commits

Author SHA1 Message Date
Weiyi Wang 42ed0254db
Merge pull request #3528 from BreadFish64/auto-nvidia
use nvidia graphics automatically on laptops with optimus
2018-03-18 23:41:08 +02:00
Mat M 79d1bcf5ba
Merge pull request #3506 from MerryMage/mov-gl_resource_manager
gl_resource_manager: Use std::exchange in move assignment operators and constructors
2018-03-17 16:30:58 -04:00
Daniel Lim Wee Soong 2b4998a122 Add check if filter is not a nullptr
Fix segfault and pass tests
2018-03-17 22:55:57 +08:00
Weiyi Wang 171cb4452f
Merge pull request #3498 from wwylele/cfg-new-framework
Service/CFG: convert to ServiceFramework
2018-03-17 13:54:29 +02:00
Markus Wick ac92664aa7 OGL: Use stream buffer for vertex data. 2018-03-17 02:02:39 +01:00
Phantom 50598fbbf4 stream buffer 2018-03-17 02:02:39 +01:00
MerryMage e3f9bfd850 gl_resource_manager: Use std::exchange instead of std::swap in move assignment operators and constructors
Move assignment operators and move constructors should ideally leave the object moved from in a state where resources aren't accessable.
2018-03-16 23:47:49 +00:00
BreadFish64 691aadb6a3 comment 2018-03-16 16:06:33 -05:00
Cameron Cawley 8d1cab4892 CMake: Set EMU_ARCH_BITS in CMakeLists.txt 2018-03-16 13:29:36 +00:00
Daniel Lim Wee Soong c4f98c1a2e Logging: Fix clang-format 2018-03-16 21:18:45 +08:00
Daniel Lim Wee Soong b5532babab Merge remote-tracking branch 'citra/master' into fmtlib-macros 2018-03-16 20:50:52 +08:00
Starlet 935bcdbd20 Convert ACT to the new service framework (#3521)
* Convert ACT to the new service framework

* Fix clang-format

* le updates to fix stuff

* Fixed one last thing.

* Well, I fucked up.

* Quick hotfix
2018-03-16 11:36:35 +02:00
Daniel Lim Wee Soong 327901e145 citra_qt: Remove reference to debugger/console 2018-03-16 12:24:16 +08:00
Daniel Lim Wee Soong 98e669cf00 Remove all edits not in the scope of this PR 2018-03-16 12:17:14 +08:00
Daniel Lim Wee Soong 373efd3158 Logging: Remove customizable logging backends
Separate code for customizing logging backends from this branch
2018-03-16 11:56:40 +08:00
Daniel Lim Wee Soong eee388588e Logging: Fix fmt errors after rebasing with master
fmt was updated during the clang-format update, which breaks the previous implementation of FmtLogMessage

Changes were:
* Move definition of FmtLogMessage into log.h to use variadic templates as FMT_VARIADIC was removed

To supplement the change above:
* Move Entry and CreateEntry into log.h
* Add LogEntry in backend.cpp
2018-03-16 11:48:33 +08:00
James Rowe ab4ba71f3e fixup! Prevent crashes on closing by waiting for the impl thread 2018-03-16 11:18:06 +08:00
James Rowe 87bc5266ef Logging: Various logging improvements
* Uses PopWait to reduce the amount of busy waiting if there aren't many
new logs
* Opens the log file as shared on windows, letting other programs read
the logs, but not write to them while citra is running
* Flushes the logs to disk if a log >= error arrives
2018-03-16 11:18:06 +08:00
James Rowe 9fdc89a456 SPSCQueue: Add PopWait
Adds a condition var to SPSCQueue so when a new log is pushed it will
wake the consumer thread that is calling PopWait. This only applies to
to queues with NeedSize=true
2018-03-16 11:18:06 +08:00
James Rowe 47f0185bcd fixup! move message 2018-03-16 11:18:06 +08:00
James Rowe 7b78425d6b Address review comments 2018-03-16 11:18:06 +08:00
James Rowe f6762f05cd Use the correct linker flag for mingw 2018-03-16 11:18:06 +08:00
James Rowe 0daac3020e Logging: Add customizable logging backends and fmtlib based macros
* Change the logging backend to support multiple sinks through the
Backend Interface
* Add a new set of logging macros to use fmtlib instead.
* Qt: Compile as GUI application on windows to make the console hidden by
default. Add filter configuration and a button to open log location.
* SDL: Migrate to the new logging macros
2018-03-16 11:18:06 +08:00
BreadFish64 55d5720962 use nvidia graphics automatically on laptops with optimus 2018-03-15 20:36:53 -05:00
Weiyi Wang a0f70912e1
Merge pull request #3513 from valentinvanelslande/layouts-fix,gitignore
.gitignore: Add CMakeLists.txt.user to Project/editor files, citra_qt: Sync menu UI settings after changing the layout with F10
2018-03-15 15:54:24 +02:00
B3n30 fd20c8c321 remove MacAddressToString 2018-03-13 11:00:05 +01:00
B3n30 b6d52f0299 Fix formatting of mac address in error log 2018-03-13 10:52:44 +01:00
Valentin Vanelslande 2f165a1ca6
citra_qt: Sync menu UI settings after changing the layout with F10 2018-03-12 18:40:54 -06:00
Weiyi Wang 6c63bb11d9
Merge pull request #3503 from j-selby/fix-leaky-enet
Handle ENet packet destruction if the packet is not sent anywhere
2018-03-11 18:40:49 +02:00
Merry 141c007037
Merge pull request #3505 from kemenaran/fix-qt-viewport-resize
Fix QGLWidget viewport resize on macOS
2018-03-11 15:25:26 +00:00
James a2b65f0669 Correctly cleanup ENet packets if not used
This additionally adds logging when bad MAC addresses are found when transferring packets between clients
2018-03-12 01:38:54 +11:00
Weiyi Wang e9900d8035
Merge pull request #3071 from B3n30/dedicated_room
Network: Added an executable to host an dedicated room for local wifi
2018-03-11 16:04:55 +02:00
Pierre de La Morinerie c4dbdeba0a Fix QGLWidget viewport resize on macOS
This fixes #2092, a long-standing bug where on macOS resizing the window
results in a garbled display.

It seems the seemingly optional child()->makeCurrent call is actually
required on macOS. Enabling it in all cases fixes the resize issue.
2018-03-11 19:22:30 +05:30
B3n30 2d464e79dc fixe typos 2018-03-11 12:58:00 +01:00
wwylele ea82203780
ipc_helper: remove interface for operating on command buffer directly
Now IPC helpers are only supposed to use on top of ServiceFramework
2018-03-10 13:37:05 +02:00
wwylele b179b86f14
Service/CFG: convert to ServiceFramework 2018-03-10 13:37:03 +02:00
wwylele 672fbcf37d Memory: remove RasterizerCachedSpecial page type 2018-03-10 01:14:38 +02:00
wwylele 92c7bb9d20 pica/gl_shader: optimize ternary operator 2018-03-10 01:14:05 +02:00
wwylele 0d6db4a0b3 lighting: compute highlight clamp after one-/two-sided diffuse pass 2018-03-10 01:14:05 +02:00
B3n30 d4cc0d8148 Fix path for travis upload 2018-03-09 19:11:32 +01:00
B3n30 b3cdf30c65 fixup! Network: Added an executable to host an dedicated room for local wifi 2018-03-09 19:11:32 +01:00
B3n30 a40ef602a3 Network: Added an executable to host an dedicated room for local wifi 2018-03-09 19:11:32 +01:00
James Rowe f61141e86a Update the entire application to use the new clang format style 2018-03-09 10:54:43 -07:00
wwylele e40d693057 Service/NFC: convert to ServiceFramework 2018-03-09 18:59:04 +02:00
Ben 42d68d6ea4
Merge pull request #3470 from wwylele/news-framework
Service/NEWS: convert to ServiceFramework
2018-03-09 17:52:21 +01:00
bunnei 3cda637cb1
Merge pull request #3478 from j-selby/libpng-switch
Remove PICA image dumping, burn libpng
2018-03-07 18:03:38 -05:00
Vamsi Krishna 04cc8fb537 Discard Gas mode renders (#3486)
* Discard gas_mode renders

This discards the gas_mode / fog effect from games that use it and allows the games to display without it.  Note that gas mode is still unimplemented and will LOG<CRITICAL>.
This bypasses #3287. (Doesn't fix it)

* fix clang
2018-03-07 18:02:36 -05:00
Weiyi Wang 5dc8ac80dd
Merge pull request #3469 from wwylele/frd-new-framework
Service/FRD: convert to ServiceFramework
2018-03-07 15:33:49 +02:00
James 077a519338 Remove unused DUMP_TEXTURES definition 2018-03-07 09:13:24 +11:00
James 9829a84fc6 Remove PICA image dumping/libpng 2018-03-07 09:10:54 +11:00
bunnei 1a2f29aad0
Merge pull request #3474 from wwylele/fuck-you-unimplemented
assert: do not crash on unimplemented code in debug build
2018-03-06 11:46:30 -05:00
tgsm 7054b63d4d Service/CFG: add system model value for New 2DS XL 2018-03-06 02:11:01 -05:00
wwylele e004e9505e assert: do not crash on unimplemented code in debug build 2018-03-05 14:53:19 +02:00
Weiyi Wang 4befbddc34
Merge pull request #3281 from jroweboy/texcache-pt2
Texture Cache Rework
2018-03-05 11:57:25 +02:00
wwylele c2515ff39d clang-format fix 2018-03-05 11:09:20 +02:00
James Rowe 1d419bac1b Disable accelerated texture copy for Texture surfaces 2018-03-04 22:06:09 -07:00
James Rowe f3234db5e2
Merge pull request #3440 from B3n30/file_read_delay
File_Sys: Add a size dependent delay for each file read
2018-03-04 21:32:50 -07:00
James Rowe 739f8e5367 Fix clang format 2018-03-04 20:59:42 -07:00
James Rowe ce725f24ca
Merge pull request #3444 from jroweboy/fix-multiplayer
UDS: Add non zero mac address to the shared page
2018-03-04 20:40:37 -07:00
James Rowe d26cf11399 Fix clang format 2018-03-04 20:27:22 -07:00
James Rowe 878217372b Remove useless static cast 2018-03-04 20:16:36 -07:00
wwylele 61069d2b67 Service/NEWS: convert to ServiceFramework 2018-03-04 20:47:55 +02:00
wwylele 3566987ecc Service/NEWS: fix command id for news:u:AddNotification
this one is different from the one in news:s
2018-03-04 20:47:54 +02:00
wwylele 54af348cfc IPC helpers: remove deprecated static buffer interface 2018-03-04 14:47:33 +02:00
wwylele 6ebd3f396f Service/FRD: convert to ServiceFramework 2018-03-04 14:47:32 +02:00
wwylele 5178e5bce1 fix clang-format 2018-03-04 13:30:29 +02:00
Weiyi Wang e4d558d114
Merge pull request #3468 from wwylele/nim-new-framework
Service/NIM: convert to ServiceFramework
2018-03-04 13:25:54 +02:00
Ben d6157a49db APT: Implement SendCaptureBufferInfo and ReceiveCaptureBufferInfo (#3467)
* APT: Implement SendCaptureBufferInfo and ReceiveCaptureBufferInfo

* adressed comments

* Clear screen_capture_buffer on Receive

* fix response in ReceiveCaptureBufferInfo

* fix response in ReceiveCaptureBufferInfo

* fix clang-format
2018-03-04 13:25:33 +02:00
wwylele 508bba2932 Service/NIM: convert to ServiceFramework 2018-03-03 19:25:26 +02:00
Weiyi Wang 001ad9da3b
Merge pull request #3462 from wwylele/am-new-framework
Service/AM: convert to ServiceFramework
2018-03-03 18:29:47 +02:00
Ben 7c1a22358a
Merge pull request #3456 from hubslave/master
Fix build on OpenBSD
2018-03-02 21:58:43 +01:00
hubslave 93fd55249b Fix build on platforms without std::string_view
json.hpp wants it, but it isn't always available. Rather than patch
json.hpp directly to remove the dependency, provide a json.h wrapper
header that subs in std::experimental::string_view using preprocessor
magic. All the consumers of json.hpp are in src/web_service, so the
wrapper header is placed there as well.
2018-03-02 18:15:45 +02:00
hubslave fd79b70a87 externals: Update fmt to 4d35f94
Versions prior to this didn't compile on OpenBSD due to unconditional
use of the non-standard strtod_l() function.

The fmt::MemoryWriter API has been removed in the intervening
versions, so replace its use with fmt::memory_buffer and fmt::format_to.

The library also no longer provides the fmt::fmt ALIAS, so define
it in externals/CMakeLists.txt.
2018-03-02 18:12:51 +02:00
wwylele 7c4ed77e06 Service/AM: fix some headers 2018-03-02 02:53:59 +02:00
wwylele 61e5f320c9 ipc_helpers: remove some deprecated functions 2018-03-02 02:53:59 +02:00
wwylele e19475481c Service/AM: convert to ServiceFramework 2018-03-01 17:02:34 +02:00
B3n30 98771a6363 GSP_GPU: Release the GPU right if the active session closes the gsp_gpu session 2018-03-01 14:54:38 +01:00
wwylele ff15d887fa remove dead code 2018-03-01 15:02:51 +02:00
Weiyi Wang 941ccaeed6
Merge pull request #3441 from wwylele/fs-new-framework
Service/FS: convert to ServiceFramework
2018-03-01 14:51:24 +02:00
Valentin Vanelslande ac626edabc Service/AM: Implement DeleteProgram and DeleteUserProgram (#3446)
* Update am.cpp

* Update am.h

* Update am_net.cpp

* Service/AM: Implement DeleteProgram

* fix clang

* Address comments

* Service/AM: DeleteProgram: Scan for all titles after deleting the title

* fix

* Service/AM: DeleteProgram: return error if the title was not found

* fix clang

* [skip ci]

* [skip ci]

* [skip ci]

* [skip ci]

* Service/AM: Implement DeleteUserProgram

* fix clang

* FileUtil::DeleteDirRecursively unexpectedly failed
2018-02-28 16:25:33 +02:00
Weiyi Wang 0cea9c54ac
Merge pull request #3434 from BreadFish64/MultipleInstalls
QT: allow installation of multiple CIAs
2018-02-28 15:55:15 +02:00
MerryMage 90b835758f decode: Fix PCM8 decoding
Signal range is -32767 to 32768, not -127 to 128.
2018-02-25 12:42:21 +00:00
B3n30 d8ac3a3435 Fix include 2018-02-24 14:46:42 +01:00
B3n30 143878a474 Rebased usage of SleepClientThread 2018-02-24 14:25:02 +01:00
B3n30 06a7676ed1 Add DelayGenerator for all file backends 2018-02-24 14:15:57 +01:00
B3n30 58b16c5459 File_Sys: Add a size dependend delay for each file read 2018-02-24 14:15:57 +01:00
James Rowe 1f87766b86 Change to use CryptoPP random and address review comments 2018-02-22 22:31:58 -07:00
hubslave 27b20359b4 core: EMULTIHOP isn't defined on all Unixes 2018-02-22 23:29:54 +02:00
hubslave 13a6e091b7 Common: fix swap functions on Bitrig and OpenBSD
swap{16,32,64} are defined as macros on the two, but client code
tries to invoke them as Common::swap{16,32,64}, which naturally
doesn't work. This hack redefines the macros as inline functions
in the Common namespace: the bodies of the functions are the
same as the original macros, but relying on OS-specific
implementation details like this is of course brittle.
2018-02-22 23:29:43 +02:00
James Rowe 752cfcaaae Move writing to shared page to the nwm init 2018-02-22 10:20:34 -07:00
James Rowe ffe94421b2 UDS: Add non zero mac address to the shared page
Apparently several games check the shared page mac address and wifi
link level values, and will refuse to start UDS if they are not correct.
This change gives a default value (in case you aren't connected to a
network) and will read the value from Room if you are connected.
2018-02-22 10:17:38 -07:00
wwylele 26a9c5832d keep the namespace comment 2018-02-22 17:46:31 +02:00
wwylele d9500ecf9b Revert "Kernel/Threads: Add a new thread status that will allow using a Kernel::Event to put a guest thread to sleep inside an HLE handler until said event is signaled" 2018-02-22 17:31:58 +02:00
Weiyi Wang e2eab46535
Merge pull request #3070 from B3n30/uds_connect_disconnect
NWM_UDS: change to Service Framework
2018-02-22 16:55:59 +02:00
wwylele dfc22661a4 NWM_UDS: change SleepClientThread to use std::chrono::nanoseconds 2018-02-22 16:44:04 +02:00
Weiyi Wang 48512d9011
Merge pull request #3101 from Subv/hle_thread_pause2
Kernel/Threads: Add a new thread status that will allow using a Kernel::Event to put a guest thread to sleep inside an HLE handler until said event is signaled
2018-02-22 16:23:34 +02:00
wwylele 42ab8d9d0b HLE: specify that the command buffer is an array of u32_le 2018-02-22 16:12:39 +02:00
Subv b0f4390247 HLE: Use std::chrono::nanoseconds instead of a plain u64 in SleepClientThread. 2018-02-21 22:03:46 -05:00
BreadFish64 165d3e1ab2 tidy loop 2018-02-19 17:11:46 -06:00
wwylele f3d22ccde4 APT: don't skip translation parameters 2018-02-19 22:30:38 +02:00