Weiyi Wang
327ad8bcce
Merge pull request #3564 from lefta/build_system_fixes
...
Build fixes
2018-03-24 13:07:14 +03:00
Merry
174e7e268a
Merge pull request #3533 from daniellimws/fmtlib-macros
...
Logging: Add fmtlib-based macros
2018-03-24 08:04:20 +00:00
Cédric Legrand
67650a4040
Upgrade Boost dependency to 1.66
2018-03-23 21:50:00 +01:00
Daniel Lim Wee Soong
11ce0f91ab
Remove dependency chrono
...
Was included last time due to adding Entry into log.h
Now it is no longer needed but I forgot to remove it last time
2018-03-22 21:42:02 +08:00
Cameron Cawley
2520ad57a5
common: Use ARCHITECTURE_x86_64 instead of ARCHITECTURE_X64
2018-03-21 22:19:59 +00:00
Cameron Cawley
1afcaed1ff
common: Use ARCHITECTURE_ARM instead of _M_ARM
2018-03-21 22:17:42 +00:00
Daniel Lim Wee Soong
4adbf29b0c
Fix clang-format
...
Oops forgot to check...
2018-03-22 00:45:01 +08:00
Daniel Lim Wee Soong
e6ee1020e1
Replace ##__VA_ARGS__ with __VA_ARGS__
2018-03-22 00:40:01 +08:00
Daniel Lim Wee Soong
c892cea029
Place FmtLogMessage's definition in backend.cpp
...
I decided to overload LogMessage because I don't see a reason to come up with a new function name just for this, but if you guys want me to overload FmtLogMessage instead I'm fine with that.
2018-03-21 23:36:45 +08:00
Weiyi Wang
d03f72eb56
Merge pull request #3535 from ccawley2011/emu_arch_bits
...
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
2018-03-21 16:15:22 +02:00
Daniel Lim Wee Soong
ceeb2810fe
Add nullptr check to LogEntry
...
Also remove explicit comparison with nullptr to make code shorter.
2018-03-20 14:15:48 +08:00
Weiyi Wang
9e4f670ea9
Merge pull request #3484 from wwylele/highlight-fix
...
pica/lighting: compute highlight clamp after one-/two-sided diffuse pass
2018-03-18 23:41:27 +02:00
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
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
wwylele
9c785814e7
Common/Hash: static_assert on the type passed to HashableStruct
2018-03-15 02:27:21 +02:00
MerryMage
a8dd3aa940
glad: Update glad
2018-03-13 23:00:26 -06:00
wwylele
30cc8c10cd
Common/Hash: abstract HashableStruct from GLShader::PicaShaderConfig
2018-03-14 00:12:40 +02: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
wwylele
9f8ff7b04e
swrasterizer: implement shadow map rendering
2018-03-13 13:07:07 +02:00
wwylele
ae75d3032f
swrasterizer: implement shadow map sampling
2018-03-13 12:56:19 +02:00
wwylele
ce2ad7436e
swrasterizer/lighting: implement shadow attenuation
2018-03-13 12:56:19 +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
