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
James Rowe
8c44447aeb
Merge pull request #3504 from degasus/vertex_streaming
...
Vertex streaming
2018-03-16 23:17:47 -06: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
James Rowe
0ad38cf3c8
Merge pull request #3522 from jroweboy/update-glad
...
Update GLAD GL bindings to include extensions
2018-03-15 00:15:27 -06:00
MerryMage
a8dd3aa940
glad: Update glad
2018-03-13 23:00:26 -06:00
Weiyi Wang
5748b3e47f
Merge pull request #3515 from B3n30/fix_format_libnetwork
...
Fix formatting of mac address in error log
2018-03-13 16:05:11 +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
Valentin Vanelslande
2bb2306bf5
.gitignore: Add CMakeLists.txt.user to Project/editor files
2018-03-12 18:37:12 -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
Mat M
5dd8ac99e3
Merge pull request #3466 from daniellimws/edit-contributing
...
Add link to Discord
2018-03-09 21:14:17 -05:00
Mat M
2085c9d7df
Merge pull request #3487 from wwylele/no-cached-io
...
Memory: remove RasterizerCachedSpecial page type
2018-03-09 21:13:20 -05: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
33a0e87ac2
Merge pull request #3410 from jroweboy/clang-format-target
...
Clang format as a build target
2018-03-09 11:10:27 -07:00
James Rowe
f61141e86a
Update the entire application to use the new clang format style
2018-03-09 10:54:43 -07:00