Commit Graph

565 Commits

Author SHA1 Message Date
MerryMage
2fd6ff0dba fix macos build 2018-01-08 19:20:10 -05:00
B3n30
51a9a51632 CoreTiming: Reworked CoreTiming (cherry-picked from Citra #3119)
* CoreTiming: New CoreTiming; Add Test for CoreTiming
2018-01-08 19:10:25 -05:00
bunnei
8f52aa7805 logging: Rename category "Core_ARM11" to "Core_ARM". 2017-10-23 00:13:12 -04:00
bunnei
0d440f89d4 core: Refactor MakeMagic usage and remove dead code. 2017-10-15 00:11:38 -04:00
bunnei
7df43f253e hle: Initial implementation of NX service framework and IPC. 2017-10-14 22:18:42 -04:00
bunnei
e69575a2bf hle: Remove a large amount of 3ds-specific service code. 2017-10-10 17:32:14 -04:00
bunnei
45b7723c75 Merge remote-tracking branch 'upstream/master' into nx
# Conflicts:
#	src/core/CMakeLists.txt
#	src/core/arm/dynarmic/arm_dynarmic.cpp
#	src/core/arm/dyncom/arm_dyncom.cpp
#	src/core/hle/kernel/process.cpp
#	src/core/hle/kernel/thread.cpp
#	src/core/hle/kernel/thread.h
#	src/core/hle/kernel/vm_manager.cpp
#	src/core/loader/3dsx.cpp
#	src/core/loader/elf.cpp
#	src/core/loader/ncch.cpp
#	src/core/memory.cpp
#	src/core/memory.h
#	src/core/memory_setup.h
2017-10-09 23:56:20 -04:00
bunnei
b500df8a4c arm: Use 64-bit addressing in a bunch of places. 2017-09-30 14:28:53 -04:00
Huw Pascoe
40a7357877 Fixed type conversion ambiguity 2017-09-30 09:34:35 +01:00
Subv
00afbdecaa Disable unary operator- on Math::Vec2/Vec3/Vec4 for unsigned types.
It is unlikely we will ever use this without first doing a Cast to a signed type.
Fixes 9 "unary minus operator applied to unsigned type, result still unsigned" warnings on MSVC2017.3
2017-09-27 09:06:41 -05:00
Weiyi Wang
a55feb2008 Merge pull request #2822 from wwylele/sw_lighting-2
Implement fragment lighting in the sw renderer (take 2)
2017-08-09 18:54:29 +03:00
bunnei
d10b614924 common: Add build timestamp to scm_rev. 2017-08-03 20:10:37 -04:00
wwylele
81da1555bb vector_math: remove dead template parameter 2017-07-11 20:08:56 +03:00
wwylele
680e67f61e vector_math: remove broken SFINAE stuff
this was originally added to eliminate warnings on MSVC, but it doesn't work for custom types.
2017-07-11 19:51:29 +03:00
Subv
ea81f6ef38 SwRasterizer: Flip the vertex quaternions before clipping (if necessary). 2017-07-11 19:39:15 +03:00
Subv
225995fb5d SwRasterizer: Corrected the light LUT lookups. 2017-07-11 19:39:15 +03:00
bunnei
789748f78d logging: Add WebService as a log cateogry. 2017-07-10 00:15:30 -04:00
B3n30
54cd2d2846 Implement basic virtual Room support based on enet (#2803)
* Added support for network with ENet lib,

connecting is possible, but data can't be sent, yet.

* fixup! Added support for network with ENet lib,

* fixup! CLang

* fixup! Added support for network with ENet lib,

* fixup! Added support for network with ENet lib,

* fixup! Clang format

* More fixups!

* Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Clang again

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
2017-07-07 15:34:15 -04:00
Kloen
d412646bce Remove unnecessary WIN32_LEAN_AND_MEAN macro definition 2017-06-30 01:59:55 +02:00
Kloen Lansfiel
7a62792411 Remove unused import in break_points.cpp (#2763) 2017-06-08 21:16:46 -07:00
Yuri Kunde Schlesner
68842aab33 CMake: Create INTERFACE targets for microprofile and nihstro 2017-05-27 22:34:52 -07:00
Yuri Kunde Schlesner
896bb090ec CMake: Use IMPORTED target for Boost 2017-05-27 20:44:51 -07:00
Yuri Kunde Schlesner
4a5d297fe7 CMake: Correct inter-module dependencies and library visibility
Modules didn't correctly define their dependencies before, which relied
on the frontends implicitly including every module for linking to
succeed.

Also changed every target_link_libraries call to specify visibility of
dependencies to avoid leaking definitions to dependents when not
necessary.
2017-05-27 18:41:24 -07:00
Yuri Kunde Schlesner
7c7d65b038 Common: Fix some out-of-style includes 2017-05-27 16:14:10 -07:00
Yuri Kunde Schlesner
65ed1a0a71 Move framebuffer_layout from Common to Core
This removes a dependency inversion between core and common. It's also
the proper place for the file since it makes screen layout decisions
specific to the 3DS.
2017-05-27 16:10:25 -07:00
bunnei
ca32a47bb0 Merge pull request #2716 from yuriks/decentralized-result
Decentralize ResultCode
2017-05-26 11:59:57 -04:00
Yuri Kunde Schlesner
675d483535 Merge pull request #2697 from wwylele/proctex
Implemented Procedural Texture (Texture Unit 3)
2017-05-24 21:37:42 -07:00
Yuri Kunde Schlesner
c899aa6840 Common: Clean up meta-template logic in BitField 2017-05-24 21:06:00 -07:00
Yuri Kunde Schlesner
6f946f7978 Make BitField and ResultCode constexpr-initializable 2017-05-24 21:05:59 -07:00
bunnei
3e2acbbba6 common: Add a generic interface for logging telemetry fields. 2017-05-24 19:16:21 -04:00
wwylele
eba689e736 pica/swrasterizer: implement procedural texture 2017-05-20 13:50:50 +03:00
Yuri Kunde Schlesner
c4406dea79 Remove unused symbols code 2017-05-07 15:33:39 -07:00
bunnei
15b414c363 Merge pull request #2512 from SonofUgly/custom-layout
Add custom layout settings.
2017-03-21 22:57:31 -04:00
bunnei
461f10ce43 Merge pull request #2497 from wwylele/input-2
Refactor input emulation & add SDL gamepad support
2017-03-17 14:59:39 -04:00
bunnei
b76cdbfe0d Merge pull request #2618 from wwylele/log-less-filename
Reduce host file name and path logging
2017-03-16 23:35:36 -04:00
Yuri Kunde Schlesner
207691eac1 common/cpu_detect: Add missing include and fix namespace scope 2017-03-12 21:55:15 -07:00
wwylele
df855674d4 file_util: Log when using local user directory 2017-03-11 18:31:17 +02:00
wwylele
d8d0f5f179 file_util: lower logging level for harmless cases 2017-03-08 17:42:10 +02:00
wwylele
63ec35d7e1 Input: add device and factory template 2017-03-01 23:30:57 +02:00
wwylele
7b74b5c546 Common: add ParamPackage 2017-03-01 23:30:57 +02:00
Yuri Kunde Schlesner
92daf89e17 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
ffb3670f6d Remove built-in (non-Microprofile) profiler 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
77b06cdfad SynchronizedWrapper: Add Lock convenience method 2017-02-26 17:22:02 -08:00
bunnei
46a89a007d Merge pull request #2569 from wwylele/wrap-unwrap
APT: implemented Wrap and Unwrap
2017-02-25 00:12:33 -05:00
SonofUgly
3280609fed Add custom layout settings. 2017-02-23 10:49:56 -08:00
James Rowe
786117c94b 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
wwylele
76af744434 HW: add AES engine & implement AES-CCM 2017-02-21 23:57:31 +02:00
noah the goodra
e0679e0966 applied the change suggested by @wwylele 2017-02-13 18:34:02 -06:00
noah the goodra
70ea2eacb0 added http service enum to the log.h file 2017-02-13 18:34:01 -06:00
Yuri Kunde Schlesner
79626b864f Merge pull request #2476 from yuriks/shader-refactor3
Oh No! More shader changes!
2017-02-04 13:02:48 -08:00