purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,213 Commits 1 Branch 0 Tags 106 MiB
c7f32931ee
Commit Graph

14278 Commits

Author SHA1 Message Date
Lioncash
ec2a6e5ba8 kernel: Remove all dependencies on the global system instance 
With this, the kernel finally doesn't depend directly on the global
system instance anymore.
 2020-09-14 14:03:13 -04:00
bunnei
042567e4b2
Merge pull request #4636 from lioncash/kernel-hle 
service: Remove two usages of the global system accessor
 2020-09-14 09:17:10 -07:00
bunnei
5fc6bf96d8
Merge pull request #4323 from ReinUsesLisp/no-spin 
kernel/scheduler: Use std::mutex instead of spin lock
 2020-09-11 23:23:53 -07:00
bunnei
ec634b6a88
Merge pull request #4634 from lioncash/blocking 
bsd: Resolve a few warnings
 2020-09-11 15:17:34 -07:00
bunnei
324029d4f9
Merge pull request #4310 from ogniK5377/apollo-1-prod 
audio_core: Apollo Part 1, AudioRenderer refactor
 2020-09-11 10:57:27 -04:00
bunnei
03179ecafe
Merge pull request #4597 from Morph1984/mjolnir-p2 
Project Mjölnir: Part 2 - Controller Applet
 2020-09-10 19:28:23 -04:00
bunnei
41b8ecdeb6
Merge pull request #4608 from lioncash/sign3 
configure_input_player: Resolve sign conversion warnings in UpdateMappingWithDefaults()
 2020-09-10 13:56:16 -04:00
FearlessTobi
57162e1df3 Test: Decrease pad_update_ns 
There have been reports of quite heavy input lag in the past.
Compared to Citra for example, our pad_update_ns value is very high.
So let's decrease it and see if it helps with this problem.
 2020-09-10 16:38:53 +02:00
Rodrigo Locatti
663ea382da
Merge pull request #4633 from ReinUsesLisp/gpu-init 
video_core: Remove all Core::System references in renderer
 2020-09-10 02:28:54 +00:00
Lioncash
ffdf8c0cb3 service: Remove two usages of the global system accessor 
Removes more instances of reliance on global state.
 2020-09-07 03:18:45 -04:00
Lioncash
c715fc4c5e gc_adapter: Make DeviceConnected() a const member function 
This doesn't modify instance state, so it can be made const.
 2020-09-07 02:49:13 -04:00
Lioncash
40968e3993 bsd: Resolve unused value within SendToImpl 
Previously the address provided to SendToImpl would never be propagated
to SendTo(). This fixes that.
 2020-09-07 01:06:30 -04:00
Lioncash
cd643ab5c9 bsd: Resolve sign comparison warnings 2020-09-07 01:06:27 -04:00
Lioncash
180fa6859f sockets_translate: Make use of designated initializers 
Same behavior, less typing.
 2020-09-07 00:53:10 -04:00
Lioncash
188a3cf74c blocking_worker: Make use of templated lambda 
We can simplify this a little by explicitly specifying the typename for
the lambda function.
 2020-09-07 00:47:46 -04:00
Lioncash
9652973db2 blocking_worker: Resolve -Wdocumentation warning 2020-09-07 00:45:53 -04:00
bunnei
841b295ad0
Merge pull request #4606 from lioncash/constexpr 
game_list_p: Mark some constants as constexpr
 2020-09-06 23:19:38 -04:00
ReinUsesLisp
9e87193725 video_core: Remove all Core::System references in renderer 
Now that the GPU is initialized when video backends are initialized,
it's no longer needed to query components once the game is running: it
can be done when yuzu is booting.

This allows us to pass components between constructors and in the
process remove all Core::System references in the video backend.
 2020-09-06 05:28:48 -03:00
bunnei
e126021ffe
Merge pull request #4397 from ReinUsesLisp/bsd 
services: Implement most of bsd:s and GetCurrentIpAddress from nifm
 2020-09-05 22:40:59 -04:00
Morph
5b6268d26a configure_input: Hook up the motion button and checkbox 
This allows toggling motion on or off, and allows access to the motion configuration.
Also changes the [waiting] text for motion buttons to Shake! as this is how motion is connected to a player.
 2020-09-05 09:46:34 -04:00
german
797564599f Minor cleanup 2020-09-05 09:42:21 -04:00
german
6ee8eab670 Add cemu hook changes related to PR #4609 2020-09-04 21:48:13 -05:00
german
0774b17846 Remove RealMotionDevice 2020-09-04 21:48:13 -05:00
Morph
8e18b61972 configure_input_player: Show/hide motion buttons based on the controller 2020-09-04 21:48:13 -05:00
Morph
df3cbd4758 controllers/npad: Simplify motion entry assignment 
Simplifies the motion assignment in the Dual Joycon entry and assigns index 1 of the motion entry (Motion 2) for the right joycon.
 2020-09-04 21:48:13 -05:00
german
ff679f3d17 Include HID and configuration changes related to motion 2020-09-04 21:48:03 -05:00
Morph
0e33b19ae0 hid: Implement MergeSingleJoyasDualJoy 
- Used in multiple games such as Super Mario Odyssey.
 2020-09-04 15:38:33 -04:00
Morph
b65456b958 applets/controller: Resolve several compiler warnings 
Resolves -Wsign-compare and -Wunused-variable
 2020-09-04 12:23:26 -04:00
Morph
076e4d44c3 Address feedback 2020-09-04 12:23:25 -04:00
Morph
1ec71b6ea0 clang-format 2020-09-04 12:23:25 -04:00
Morph
f95ea04995 applets/controller: Set min_players to have a minimum value of 1. 
- Some games like Shipped have a minimum requirement of 0 connected players and is undesired behavior. We must require a minimum of 1 player connected regardless of what games may ask.
 2020-09-04 12:23:25 -04:00
Morph
371226448a applets/controller: Modify heuristic to account for certain games 
Now left and right joycons have the same priority (meaning both needs to be supported by the game).

Explanation of the new heuristic:
Assign left joycons to even player indices and right joycons to odd player indices.
We do this since Captain Toad Treasure Tracker expects a left joycon for Player 1 and a right Joycon for Player 2 in 2 Player Assist mode.
 2020-09-04 12:23:25 -04:00
Morph
6597b3817c main: Apply settings after applet configuration is complete. 2020-09-04 12:23:25 -04:00
Morph
7299356f37 applets/controller: Implement fallback applet for the SDL frontend 
Implement the fallback applet for the SDL frontend, connecting only the minimum amount of players required.
 2020-09-04 12:23:25 -04:00
Morph
72b2f5d34f applets/controller: Load configuration prior to setting up connections 
This avoids unintentionally changing the states of elements while loading them in.
 2020-09-04 12:23:25 -04:00
Morph
aeec0f8a38 applets/controller: Make 8 a static constexpr value of NUM_PLAYERS 
Avoids repetitive usages of the int literal '8' or calls to player_widgets.size()
 2020-09-04 12:23:25 -04:00
Morph
5ce3015945 applets/controller: Implement "Explain Text" 
"Explain Text" is additional text that is shown for each player in the controller applet.
 2020-09-04 12:23:25 -04:00
Morph
5219615418 Project Mjölnir: Part 2 - Controller Applet 
Co-authored-by: Its-Rei <kupfel@gmail.com>
 2020-09-04 12:23:25 -04:00
bunnei
94a25b75a0
Merge pull request #4611 from lioncash/xbyak2 
externals: Update Xbyak to 5.96
 2020-09-03 20:24:27 -04:00
bunnei
3b0fe38e86
Merge pull request #4583 from lioncash/trunc 
gc_poller: Resolve compilation warnings on MSVC
 2020-09-03 20:23:33 -04:00
bunnei
40c230e0fa
Merge pull request #4578 from lioncash/xor 
common_funcs: Add missing XOR operators to DECLARE_ENUM_FLAG_OPERATORS
 2020-09-03 17:11:51 -04:00
bunnei
ba5419b965
Merge pull request #4590 from ReinUsesLisp/tsan-sched 
hle/scheduler: Fix data race in is_context_switch_pending
 2020-09-03 14:39:57 -04:00
bunnei
39319f09d8
Merge pull request #4575 from lioncash/async 
async_shaders: Mark getters as const member functions
 2020-09-03 11:34:30 -04:00
ReinUsesLisp
827ff077e7 file_sys/patch_manager: Add missing include 
Fixes build issues
 2020-09-03 04:51:49 -03:00
bunnei
38980b2471
Merge pull request #4568 from lioncash/fsp 
fsp_srv: Resolve -Wmaybe_uninitialized warning in OpenSaveDataFileSystem()
 2020-09-02 23:07:03 -04:00
bunnei
57e43682ed
Merge pull request #4564 from lioncash/file-include 
file_sys: Replace inclusions with forward declarations where applicable
 2020-09-02 23:06:38 -04:00
lat9nq
0914e84014 main: Use three dots to complete the ellipsis 
Fixes a typo in the UI file. An ellipsis has 3 dots.
 2020-09-02 15:23:15 -04:00
Morph
45ecd601be input_common/motion_input: Make use of Common::PI constant 
Also amend the copyright notice to yuzu's instead of Dolphin's, which was mistakenly copy-pasted from another file.
 2020-09-02 11:58:15 -04:00
bunnei
f64917a852
Merge pull request #4570 from german77/motionInput 
input_common: Add a basic class for motion devices
 2020-09-02 11:09:18 -04:00
bunnei
3dcccabd1d
Merge pull request #4382 from FearlessTobi/port-udp-config 
yuzu: Add motion and touch configuration from Citra
 2020-09-01 13:56:37 -04:00
bunnei
ad9ce67b52
Merge pull request #4588 from ReinUsesLisp/tsan-event 
common/thread: Fix data race in is_set
 2020-08-31 21:21:38 -04:00
bunnei
a1f13a3662
Merge pull request #4589 from ReinUsesLisp/tsan-host 
hle/kernel: Fix data race in GetCurrentHostThreadID
 2020-08-31 21:20:49 -04:00
LC
b5ed2d408c
Merge pull request #4461 from comex/thread-names 
Fix thread naming on Linux, which limits names to 15 bytes.
 2020-08-31 15:31:48 -04:00
ReinUsesLisp
c573920c01 vk_device: Fix driver id check on AMD for VK_EXT_extended_dynamic_state 
'driver_id' can only be known on Vulkan 1.1 after creating a logical
device. Move the driver id check to disable
VK_EXT_extended_dynamic_state after the logical device is successfully
initialized.

The Vulkan device will have the extension enabled but it will not be
used.
 2020-08-30 20:22:48 -03:00
Lioncash
a5dcccfdd2 externals: Update Xbyak to 5.96 
I made a request on the Xbyak issue tracker to allow some constructors
to be constexpr in order to avoid static constructors from needing to
execute for some of our register constants.

This request was implemented, so this updates Xbyak so that we can make
use of it.
 2020-08-30 05:09:48 -04:00
bunnei
e9b9fc4674
Merge pull request #4601 from lioncash/const3 
sdl_impl: Minor cleanup
 2020-08-29 23:23:41 -04:00
bunnei
37faf24c3f
Merge pull request #4605 from lioncash/copy3 
bootmanager: Prevent unnecessary copies in TouchUpdateEvent()
 2020-08-29 23:22:39 -04:00
FearlessTobi
d1e1ea0fef Address second batch of reviews 2020-08-30 00:43:25 +02:00
Lioncash
92c162126b configure_input_player: Resolve sign conversion warnings in UpdateMappingWithDefaults() 
Prevents sign mismatch warnings in the loop conditionals.
 2020-08-29 16:43:12 -04:00
FearlessTobi
0aa6ec4276 Reolve reorder warning 2020-08-29 22:06:47 +02:00
FearlessTobi
d176feffad Address review comments and fix code compilation 2020-08-29 20:56:51 +02:00
Lioncash
1aba91e993 bootmanager: Prevent unnecessary copies in TouchUpdateEvent() 
The list of points is returned by const reference, so we don't need to
make a copy of every element in the list.
 2020-08-29 14:33:10 -04:00
Lioncash
fae65d8a72 game_list_p: Avoid string churn in GameListItemPath data() 2020-08-29 14:30:49 -04:00
Lioncash
cde658cb27 game_list_p: Mark some constants as constexpr 
Consistency change with how we mark constants in the rest of the
codebase.
 2020-08-29 14:23:41 -04:00
FearlessTobi
e6bd1fd1b8 yuzu: Add motion and touch configuration 2020-08-29 18:56:34 +02:00
LC
ce43139eb7
Merge pull request #4604 from lioncash/lifetime 
yuzu/main: Amend lifetime issues with InputSubsystem
 2020-08-29 01:33:29 -04:00
Lioncash
bcd3c79eca yuzu/main: Amend lifetime issues with InputSubsystem 
Due to the way Qt performs destruction of parent/child widgets, we need
to make the lifetime of the input subsystem shared across the main
window and the render window.
 2020-08-29 00:58:11 -04:00
Morph
403e36fab2 yuzu/configuration: Fix index out of bounds for default_analogs 2020-08-29 00:24:47 -04:00
Lioncash
69fa6b4906 sdl_impl: Reduce allocations in GetButtonMappingForDevice() 
These maps can be constexpr arrays of std::pair.
 2020-08-28 21:24:17 -04:00
Lioncash
f2a680ca89 sdl_impl: Make use of std::move on std::string where applicable 
Avoids redundant copies.
 2020-08-28 21:14:54 -04:00
Lioncash
e92164e6a0 sdl_impl: Make use of insert_or_assign() where applicable 
Avoids churning ParamPackage instances.
 2020-08-28 21:13:26 -04:00
Lioncash
f3ac088345 sdl_impl: Prevent type truncation in BuildAnalogParamPackageForButton() default arguments 
We need to add the 'f' suffix to make the right hand side a float and
not a double.
 2020-08-28 21:08:08 -04:00
Lioncash
2e2dde2f95 sdl_impl: Simplify make_tuple call 
The purpose of make_tuple is that you don't need to explicitly type out
the types of the things that comprise said tuple.

Given this just returns default values, we can simplify this a bit.
 2020-08-28 21:04:18 -04:00
Lioncash
2680526e6b sdl_impl: Mark FromEvent() as a const member function 
This doesn't modify internal member state, so it can be marked as const.
 2020-08-28 20:58:49 -04:00
LC
57d9ef5a89
Merge pull request #4600 from lioncash/prototype 
input_common/main: Remove unimplemented prototype
 2020-08-28 20:10:33 -04:00
Lioncash
98f5d8a713 input_common/main: Remove unnecessary headers 2020-08-28 19:23:19 -04:00
Lioncash
4b9b203c09 input_common/main: Remove unimplemented prototype 
I forgot to remove this in the rebase when removing most of the global
variables within the input common codebase.
 2020-08-28 19:11:17 -04:00
ReinUsesLisp
fe90c4fd7b vk_device: Blacklist AMD proprietary from VK_EXT_extended_dynamic_state 
Vertex binding's <stride> is bugged on AMD's proprietary drivers when
using VK_EXT_extended_dynamic_state. Blacklist it for now while we
investigate how to report this issue to AMD.
 2020-08-28 19:14:57 -03:00
bunnei
45b73ba840
Merge pull request #4544 from lioncash/input-sub 
input_common: Eliminate most global state
 2020-08-28 09:57:50 -04:00
bunnei
40320a1d84
Merge pull request #4586 from yuzu-emu/tsan-cpu-interrupt 
cpu_interrupt_handler: Make is_interrupted an atomic
 2020-08-28 09:21:47 -04:00
german
1be18dc110 Fix orientation errors and improve drift correction 2020-08-27 17:19:21 -05:00
german
e6fc3b5662 Address comments 2020-08-27 17:19:21 -05:00
german
2d207ec609 Implement a basic class for motion devices 2020-08-27 17:19:21 -05:00
Lioncash
9e1b0af259 input_common: Eliminate most global state 
Abstracts most of the input mechanisms under an InputSubsystem class
that is managed by the frontends, eliminating any static constructors
and destructors. This gets rid of global accessor functions and also
allows the frontends to have a more fine-grained control over the
lifecycle of the input subsystem.

This also makes it explicit which interfaces rely on the input subsystem
instead of making it opaque in the interface functions. All that remains
to migrate over is the factories, which can be done in a separate
change.
 2020-08-27 16:11:17 -04:00
bunnei
3db9a25977
Merge pull request #4530 from Morph1984/mjolnir-p1 
Project Mjölnir: Part 1 - Input Rewrite
 2020-08-27 14:58:44 -04:00
bunnei
3f7b0e0772
Merge pull request #4577 from lioncash/asserts 
common/assert: Make use of C++ attribute syntax
 2020-08-27 11:09:02 -04:00
bunnei
9864da7d43
Merge pull request #4524 from lioncash/memory-log 
shader/memory: Amend UNIMPLEMENTED_IF_MSG without a message
 2020-08-27 00:16:10 -04:00
bunnei
1bb8c27a70
Merge pull request #4569 from ReinUsesLisp/glsl-cmake 
video_core/host_shaders: Add CMake integration for string shaders
 2020-08-26 22:57:39 -04:00
Morph
8ffc491546 input_common/main: Add "/Mouse" to the display name 2020-08-26 22:41:51 -04:00
bunnei
1e2a92918b
Merge pull request #4555 from ReinUsesLisp/fix-primitive-topology 
vk_state_tracker: Fix primitive topology
 2020-08-26 22:19:52 -04:00
Lioncash
7b50c48df7 memory_manager: Make use of [[nodiscard]] in the interface 2020-08-26 20:15:03 -04:00
Lioncash
d12d59f62a memory_manager: Make operator+ const qualified 
This doesn't modify member state, so it can be marked as const.
 2020-08-26 20:11:58 -04:00
Morph
f5f30781ae configure_input_player: Fix modifier scale button mapping 2020-08-26 02:32:32 -04:00
Morph
1bd70d73c0 configuration/input: Add support for mouse button clicks 
Supports the Left, Right, Middle, Backward and Forward mouse buttons.
 2020-08-26 02:32:32 -04:00
Morph
eb149ec696 controllers/npad: Fix inconsistencies with controller connection statuses 2020-08-26 02:32:32 -04:00
Morph
334ef2efdd controllers/npad: Fix LibNX controller connection statuses 
This allows homebrew applications to be able to properly detect connected controllers.
 2020-08-26 02:32:32 -04:00
Morph
e7c174b426 controllers/npad: Fix LedPattern for P1-4 2020-08-26 02:32:32 -04:00
Morph
de79897f04 input_common: Fix directional deadzone values 
The hardware tested value is 0.5 which translates to SHRT_MAX / 2
 2020-08-26 02:32:32 -04:00
Morph
efa0b7a056 Address feedback 2020-08-26 02:32:32 -04:00
Morph
f0fac0c7fb Project Mjölnir: Part 1 
Co-authored-by: James Rowe <jroweboy@gmail.com>
Co-authored-by: Its-Rei <kupfel@gmail.com>
 2020-08-26 02:32:32 -04:00
Lioncash
f60d5aac3e gc_poller: Resolve compilation warnings on MSVC 
We just need to make our intentional implicit truncations explicit.
 2020-08-25 23:03:12 -04:00
ReinUsesLisp
ccdd84a778 hle/scheduler: Fix data race in is_context_switch_pending 
As reported by tsan, SelectThreads could write to
is_context_switch_pending holding a mutex while SwitchToCurrent reads it
without holding any.

It is assumed that the author didn't want an atomic here, so the code is
reordered so that whenever is_context_switch_pending is read inside
SwitchToContext, the mutex is locked.
 2020-08-26 02:56:05 +00:00
ReinUsesLisp
36eade7f4c hle/kernel: Fix data race in GetCurrentHostThreadID 
As reported by tsan, host_thread_ids could be read while
any of the RegisterHostThread variants were called.

To fix this, lock the register mutex when yuzu is running in multicore
mode and GetCurrentHostThreadID is called.
 2020-08-26 02:52:50 +00:00
ReinUsesLisp
f119ef798b common/thread: Fix data race in is_set 
As report by tsan, Event::Set can write is_set while WaitFor and friends
are reading from it. To address this issue, make is_set an atomic.
 2020-08-26 02:50:51 +00:00
ReinUsesLisp
56ac22f737 cpu_interrupt_handler: Misc style changes 2020-08-26 02:43:26 +00:00
ReinUsesLisp
ea7bda25ba cpu_interrupt_handler: Make is_interrupted an atomic 
Fixes a race condition detected from tsan
 2020-08-26 02:43:15 +00:00
bunnei
902bf6d37d
Merge pull request #4574 from lioncash/const-fn 
memory_manager: Mark IsGranularRange() as a const member function
 2020-08-25 11:24:13 -04:00
bunnei
dd828607e0
Merge pull request #4563 from lioncash/rcache 
registered_cache: Make use of designated initializers
 2020-08-25 10:07:33 -04:00
bunnei
b798813eee
Merge pull request #4548 from lioncash/color 
common/color: Migrate code over to the Common namespace
 2020-08-25 10:07:13 -04:00
bunnei
bb752df736
Merge pull request #4542 from ReinUsesLisp/gpu-init-base 
video_core: Initialize renderer with a GPU
 2020-08-24 22:56:11 -04:00
bunnei
6fd3a1bf85
Merge pull request #4562 from lioncash/loop 
cpu_manager: Make use of ranged for where applicable
 2020-08-24 17:58:41 -04:00
Lioncash
504175e5b6 common_funcs: Add missing XOR operators to DECLARE_ENUM_FLAG_OPERATORS 
Ensures that the full set of bitwise operators are available for types
that make use of this macro.
 2020-08-24 04:42:43 -04:00
Lioncash
3bfaabdbdd common/assert: Make use of C++ attribute syntax 
Normalizes the syntax used for attributes
 2020-08-24 04:15:10 -04:00
Lioncash
bafef3d1c9 async_shaders: Mark getters as const member functions 
While we're at it, we can also mark them as nodiscard.
 2020-08-24 01:15:50 -04:00
Lioncash
5bce81c3d6 memory_manager: Mark IsGranularRange() as a const member function 
This doesn't modify internal member state, so it can be marked as const.
 2020-08-24 00:37:57 -04:00
Lioncash
bae4e6c2f5 gl_texture_cache: Take std::string by reference in DecorateViewName() 
LabelGLObject takes a string_view, so we don't need to make copies of
the std::string.
 2020-08-23 23:36:33 -04:00
Lioncash
f3bb52c0a9 video_core/fence_manager: Remove unnecessary includes 
Avoids pulling in unnecessary things that can cause rebuilds when they
aren't required.
 2020-08-23 21:44:50 -04:00
bunnei
ab350b8975
Merge pull request #4561 from lioncash/key-constexpr 
key_manager: Make data arrays constexpr
 2020-08-23 20:41:05 -04:00
ReinUsesLisp
91df2beee3 video_core/host_shaders: Add CMake integration for string shaders 
Add the necessary CMake code to copy the contents in a string source
shader (GLSL or GLASM) to a header file then consumed by video_core
files.

This allows editting GLSL in its own files without having to maintain
them in source files.

For now, only OpenGL presentation shaders are moved, but we can add
GLASM presentation shaders and static SPIR-V generation through
glslangValidator in the future.
 2020-08-23 21:37:20 -03:00
ReinUsesLisp
0eaf7e1daa gl_shader_util: Use std::string_view instead of star pointer 
This allows us passing any type of string and hinting the length of the
string to the OpenGL driver.
 2020-08-23 21:23:54 -03:00
bunnei
42a00877a2
Merge pull request #4549 from lioncash/files 
vfs_real: Avoid redundant map lookups
 2020-08-23 19:08:36 -04:00
bunnei
9619964e8c
Merge pull request #4559 from lioncash/webresult 
web_service: Move web_result.h into web_service
 2020-08-23 17:54:43 -04:00
Lioncash
4c1a95ed61 fsp_srv: Resolve -Wunused-but-set-variable warning 
We can just log out the parameters in the meantime.
 2020-08-23 17:16:32 -04:00
Lioncash
01d1b5cdaf file_sys: Replace inclusions with forward declarations where applicable 
Same behavior, minus unnecessary inclusions where not necessary.
 2020-08-23 17:02:55 -04:00
Lioncash
85db5f4091 fsp_srv: Resolve -Wmaybe_uninitialized warning in OpenSaveDataFileSystem() 
Initialize id to a deterministic value and also mark the unreachable
cases in the switch with UNREACHABLE().
 2020-08-23 16:37:57 -04:00
Lioncash
67a8e73101 registered_cache: Make use of ends_with for string suffix checking 
Simplifies code.
 2020-08-23 11:25:45 -04:00
Lioncash
f83c6e1e0c registered_cache: Make use of designated initializers 
Removes the need for comments to indicate the fields being assigned.
 2020-08-23 10:26:20 -04:00
bunnei
cfb7fd395c
Merge pull request #4560 from lioncash/convert 
core_timing: Resolve sign conversion warning
 2020-08-23 02:11:14 -04:00
Lioncash
b62a8ca43e key_manager: Make data arrays constexpr 
We can convert these maps into constexpr arrays to eliminate some
runtime static constructors.
 2020-08-22 22:47:24 -04:00
Lioncash
544fbd5c84 cpu_manager: Make use of ranged for where applicable 
We can simplify a few loops by making use of ranged for.
 2020-08-22 22:43:19 -04:00
Lioncash
79504f1a39 core_timing: Remove unused header 2020-08-22 22:12:37 -04:00
Lioncash
25cd5d9dda core_timing: Move clock initializer into constructor initializer list 
Same behavior, minus unnecessary zeroing out of the pointer.
 2020-08-22 20:26:48 -04:00
Lioncash
2624b1eae6 core_timing: Resolve sign conversion warning 
This constant is only ever assigned to downcount, which is a s64, not a
u64.
 2020-08-22 20:26:45 -04:00
Lioncash
ca5ed50655 web_service: Move web_result.h into web_service 
This is the only place it's actively used. It's also more appropriate
for web-related structures to be within the web service target.
Especially given this one doesn't rely on anything in the common
library.
 2020-08-22 19:29:54 -04:00
ReinUsesLisp
da53bcee60 video_core: Initialize renderer with a GPU 
Add an extra step in GPU initialization to be able to initialize render
backends with a valid GPU instance.
 2020-08-22 01:51:45 -03:00
bunnei
baff9ffcac
Merge pull request #4521 from lioncash/optionalcache 
gl_shader_disk_cache: Make use of std::nullopt where applicable
 2020-08-21 23:56:55 -04:00
bunnei
66ac7cf730
Merge pull request #4541 from MerryMage/yolo 
dynarmic: Add unsafe optimizations
 2020-08-21 23:06:21 -04:00
bunnei
53fbf8e206
Merge pull request #4523 from lioncash/self-assign 
macro-interpreter: Resolve -Wself-assign-field warning
 2020-08-21 18:25:53 -04:00
ReinUsesLisp
aed6011d7c vk_state_tracker: Fix primitive topology 
State track the current primitive topology with a regular comparison
instead of using dirty flags.

This fixes a bug in dirty flags for this particular state and it also
avoids unnecessary state changes as this property is stored in a
frequently changed bit field.
 2020-08-20 23:07:30 -03:00
ReinUsesLisp
c5a78f4480 vk_device: Use Vulkan 1.0 properly 
Enable the required capabilities to use Vulkan 1.0 without validation
errors and disable those that are not compatible with it.
 2020-08-20 16:55:22 -03:00
ReinUsesLisp
29a0ca2391 renderer_vulkan: Create a Vulkan 1.0 instance when 1.1 is not available 
This commit doesn't make yuzu compatible with Vulkan 1.0 yet, it only
creates an 1.0 instance.
 2020-08-20 16:55:22 -03:00
bunnei
3ea3de4ecd
Merge pull request #4546 from lioncash/telemetry 
common/telemetry: Migrate namespace into the Common namespace
 2020-08-20 14:29:13 -04:00
bunnei
3b8a8cf825
Merge pull request #4547 from lioncash/header-concept 
common/concepts: Move <type_traits> include out of the Common namespace
 2020-08-19 23:29:45 -04:00
bunnei
acbae572d3
Revert "common/time_zone: Simplify GetOsTimeZoneOffset()" 2020-08-19 18:27:31 -04:00
bunnei
b1fa647f28
Merge pull request #4539 from lioncash/disc 
common: Silence two discarded result warnings
 2020-08-18 22:03:09 -04:00
bunnei
2d2e235bcf
Merge pull request #4522 from lioncash/vulk-copy 
vulkan/wrapper: Avoid unnecessary copy in EnumerateInstanceExtensionProperties()
 2020-08-18 19:31:35 -04:00
Lioncash
f6bb905182 common/telemetry: Migrate namespace into the Common namespace 
Migrates the Telemetry namespace into the Common namespace to make the
code consistent with the rest of our common code.
 2020-08-18 15:08:32 -04:00
Lioncash
551882e512 vfs_real: Resolve sign conversion warnings 2020-08-18 14:58:33 -04:00
Lioncash
ed9ae5a977 vfs_real: Avoid redundant map lookups 
Avoids some trivially avoidable map lookups by keeping the result of
find operations around and querying them.
 2020-08-18 14:58:29 -04:00
Lioncash
e864aa25d5 common/color: Migrate code over to the Common namespace 
No external code makes use of this header, so we can freely change the
namespace.
 2020-08-18 14:27:41 -04:00
Lioncash
999fc2fece common/concepts: Move <type_traits> include out of the Common namespace 
This is a compiler/linker error waiting to happen.
 2020-08-18 14:24:54 -04:00
bunnei
bea9ed2548
Merge pull request #4381 from Morph1984/fix-open-folder-installed-title 
main: Fix Open Save/Mod Locations for installed titles
 2020-08-18 12:54:06 -04:00
bunnei
00573fb2c9
Merge pull request #4532 from lioncash/object-name 
configuration_shared: Simplify name lookup in highlighting functions
 2020-08-18 00:45:02 -04:00
bunnei
56c6a5def8
Merge pull request #4535 from lioncash/fileutil 
common/fileutil: Convert namespace to Common::FS
 2020-08-17 22:35:30 -04:00
bunnei
0c885249df
Merge pull request #4537 from lioncash/tz 
common/time_zone: Simplify GetOsTimeZoneOffset()
 2020-08-17 14:27:02 -04:00
bunnei
3472c00b3b
Merge pull request #4540 from lioncash/tr3 
configure_hotkeys: Don't translate empty strings
 2020-08-17 12:24:58 -04:00
bunnei
0530dd6ea1
Merge pull request #4494 from lioncash/transcode 
aes_util: Make use of non-template variant of Transcode
 2020-08-17 03:50:35 -04:00
Rodrigo Locatti
d8a90e6536
Merge pull request #4531 from lioncash/overload 
yuzu: Make use of qOverload where applicable
 2020-08-17 04:13:14 -03:00
David
cbaf1bc711
Merge pull request #4443 from ameerj/vk-async-shaders 
vulkan_renderer: Async shader/graphics pipeline compilation
 2020-08-17 15:06:11 +10:00
bunnei
bbb5623f52
Merge pull request #4515 from lat9nq/pgs-menubar-config 
main: Add an option to modify the currrent game's configuration
 2020-08-17 01:03:39 -04:00
David
a91acd5365
Merge pull request #4520 from lioncash/pessimize 
async_shaders: Resolve -Wpessimizing-move warning
 2020-08-17 14:36:05 +10:00
ameerj
fde8102a41 Remove unneeded newlines, optional Registry in shader params 
Addressing feedback from Rodrigo
 2020-08-16 16:33:21 -04:00
Ameer J
f49ffdd648 Morph: Update worker allocation comment 
Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
 2020-08-16 12:02:22 -04:00
ameerj
1b829fbd7a move thread 1/4 count computation into allocate workers method 2020-08-16 12:02:22 -04:00
ameerj
31a76410e8 Address feedback, add shader compile notifier, update setting text 2020-08-16 12:02:22 -04:00
ameerj
c02464f64e Vk Async Worker directly emplace in cache 2020-08-16 12:02:22 -04:00
ameerj
4539073ce1 Address feedback. Bruteforce delete duplicates 2020-08-16 12:02:22 -04:00
ameerj
6ac97405df Vk Async pipeline compilation 2020-08-16 12:02:22 -04:00
David Marcec
80ac1331b5 Preliminary effects 2020-08-17 01:23:55 +10:00
MerryMage
836ec9176a dynarmic: Add unsafe optimizations 2020-08-16 14:15:39 +01:00
Lioncash
e23289d869 configure_hotkeys: Don't translate empty strings 
There's no need to translate an empty string. This just gives
translators unnecessary work.
 2020-08-16 08:13:25 -04:00
Lioncash
c4ed791164 common/fileutil: Convert namespace to Common::FS 
Migrates a remaining common file over to the Common namespace, making it
consistent with the rest of common files.

This also allows for high-traffic FS related code to alias the
filesystem function namespace as

namespace FS = Common::FS;

for more concise typing.
 2020-08-16 06:52:40 -04:00
Lioncash
d09456fc41 common: Silence two discarded result warnings 
These are intentionally discarded internally, since the rest of the
public API allows querying success. We want all non-internal uses of
these functions to be explicitly checked, so we can signify that we
intentionally want to discard the return values here.
 2020-08-16 06:17:33 -04:00
Lioncash
fe97d34156 common/time_zone: Simplify GetOsTimeZoneOffset() 
We can simplify this function down into a single line with the use of
fmt. A benefit with the fmt approach is that the fmt variant of
localtime is thread-safe as well, making GetOsTimeZoneOffset()
thread-safe as well.
 2020-08-16 03:58:47 -04:00
Lioncash
dbb1cbce67 yuzu: Resolve -Wextra-semi warnings 
While we're in the same area, we can ensure GameDir member variables are
always initialized to consistent values.
 2020-08-16 03:58:29 -04:00
bunnei
db96034ea4
Merge pull request #4528 from lioncash/discard 
common: Make use of [[nodiscard]] where applicable
 2020-08-16 01:47:54 -04:00
bunnei
404362e1b0
Merge pull request #4519 from lioncash/semi 
maxwell_3d: Resolve -Wextra-semi warning
 2020-08-16 00:55:15 -04:00
lat9nq
9f972b7d01 main: Add an option to modify the currrent game's configuration 
Creates a new entry in the Emulation menu called "Configure Current Game..." that is only available if a game is currently being executed in yuzu. When selected, it opens the game properties dialog for the current game.

Thanks to @BSoDGamingYT for reminding me to do this.
 2020-08-15 20:28:48 -04:00
Lioncash
1ee060ca0d common/compression: Roll back std::span changes 
Seems like all compilers don't support std::span yet.
 2020-08-15 17:17:56 -04:00
Lioncash
df72480395 common: Make use of [[nodiscard]] where applicable 
Now that clang-format makes [[nodiscard]] attributes format sensibly, we
can apply them to several functions within the common library to allow
the compiler to complain about any misuses of the functions.
 2020-08-15 17:17:52 -04:00
bunnei
2b601e8636
Merge pull request #4526 from lioncash/core-semi 
core: Resolve several -Wextra-semi warnings
 2020-08-15 02:14:11 -04:00
bunnei
e6f9231ef0
Merge pull request #4527 from lioncash/pessimizing2 
software_keyboard: Resolve a pessimizing move warning
 2020-08-15 02:13:44 -04:00
bunnei
cb6808b4d0
Merge pull request #4492 from lioncash/linkage 
system_control: Make functions internally linked where applicable
 2020-08-15 02:11:49 -04:00
bunnei
2aabd1eb05
Merge pull request #4463 from lioncash/lockdiscard 
kernel/scheduler: Mark SchedulerLock constructor as nodiscard
 2020-08-15 01:31:23 -04:00
bunnei
feb243b08d
Merge pull request #4416 from lioncash/span 
lz4_compression/zstd_compression: Make use of std::span in interfaces
 2020-08-15 00:53:11 -04:00
bunnei
2dace90346
Merge pull request #4453 from ReinUsesLisp/block-to-linear 
textures/decoders: Fix block linear to pitch copies
 2020-08-14 19:52:12 -04:00
Lioncash
fe86109877 configuration_shared: Simplify name lookup in highlighting functions 
We can query the given object name directly from the widget itself. This
removes any potential for forgetting to change the name if the widget
gets renamed and makes the API much simpler (just pass in the widget,
and not worry about its name).
 2020-08-14 14:17:02 -04:00
Lioncash
969a4cc4da yuzu: Make use of qOverload where applicable 
Eliminates a verbose function cast.
 2020-08-14 14:12:55 -04:00
Lioncash
b14277ef97 time_zone_content_manager: Collapse auto and default case 
Prevents a useless self-assignment from occurring.
 2020-08-14 10:58:58 -04:00
David Marcec
1f1c3bddc0 Disable biquad filter 2020-08-14 23:20:20 +10:00
Lioncash
03d5a5d9de software_keyboard: Resolve a pessimizing move warning 
A std::vector created in place like this is already an rvalue and
doesn't need to be moved.
 2020-08-14 09:14:54 -04:00
Lioncash
2296e921d2 core: Resolve several -Wextra-semi warnings 
We can amend one of the cascade macros to require semicolons in order to
compile. In other cases, we can just remove the superfluous semicolons.
 2020-08-14 09:09:20 -04:00
Lioncash
dcc5562cd5 shader/memory: Amend UNIMPLEMENTED_IF_MSG without a message 
We need to provide a message for this variant of the macro, so we can
simply log out the type being used.
 2020-08-14 08:38:37 -04:00
Lioncash
34ec64233a macro-interpreter: Resolve -Wself-assign-field warning 
This was assigning the field to itself, which is a no-op. The size
doesn't change between its initial assignment and this one, so this is a
safe change to make.
 2020-08-14 08:26:50 -04:00
Lioncash
167d36ec3c vulkan/wrapper: Avoid unnecessary copy in EnumerateInstanceExtensionProperties() 
Given this is implicitly creating a std::optional, we can move the
vector into it.
 2020-08-14 08:23:49 -04:00
Lioncash
c8135b3c18 gl_shader_disk_cache: Make use of std::nullopt where applicable 
Allows the compiler to avoid unnecessarily zeroing out the internal
buffer of std::optional on some implementations.
 2020-08-14 08:20:44 -04:00
Lioncash
6b13d08822 async_shaders: Resolve -Wpessimizing-move warning 
Prevents pessimization of the move constructor (which thankfully didn't
actually happen in practice here, given std::thread isn't copyable).
 2020-08-14 08:16:50 -04:00
Lioncash
83d8bf9af9 maxwell_3d: Resolve -Wextra-semi warning 
Semicolons after a function definition aren't necessary.
 2020-08-14 08:13:41 -04:00
David Marcec
1b3d86c02f Reworked ADPCM decoder to allow better streaming 2020-08-14 21:04:28 +10:00
Lioncash
a93f6e51d3 emu_window: Mark Scoped constructor and Acquire() as nodiscard 
Ensures that callers make use of the constructor, preventing bugs from
silently occurring.
 2020-08-14 04:43:44 -04:00
Lioncash
f808258ed9 kernel/scheduler: Mark SchedulerLock constructor as nodiscard 
Allows the compiler to warn about cases where the constructor is used
but then immediately discarded, which is a potential cause of
locking/unlocking bugs.
 2020-08-14 04:43:44 -04:00
Rodrigo Locatti
e050594706
Merge pull request #4495 from lioncash/conv 
cheat_engine: Resolve implicit bool->u64 conversion
 2020-08-14 03:10:17 -03:00
bunnei
a9de967fa3
Merge pull request #4514 from Morph1984/worker-alloc 
gl_shader_cache: Use std::max() for determining num_workers
 2020-08-13 17:06:57 -04:00
LC
ff0b14ee62
Merge pull request #4511 from lioncash/build2 
General: Tidy up clang-format warnings part 2
 2020-08-13 15:13:21 -04:00
Lioncash
b724a4d90c General: Tidy up clang-format warnings part 2 2020-08-13 14:19:08 -04:00
Morph
e0ff98dd34 gl_shader_cache: Use std::max() for determining num_workers 
Does not allocate more threads than available in the host system for boot-time shader compilation and always allocates at least 1 thread if hardware_concurrency() returns 0.
 2020-08-12 09:23:34 -04:00
bunnei
a8ffe6eee4
Merge pull request #4497 from lioncash/freezer-alg 
freezer: Make use of std::erase_if
 2020-08-11 23:07:17 -04:00
bunnei
e143adc3cf
Merge pull request #4493 from jbeich/dragonfly 
common/virtual_buffer: drop unused includes
 2020-08-11 12:52:50 -04:00
bunnei
4605e4d6ff
Merge pull request #4502 from lioncash/build 
General: Tidy up clang-format warnings
 2020-08-11 11:04:05 -04:00
ReinUsesLisp
f00641459e textures/decoders: Fix block linear to pitch copies 
There were two issues with block linear copies. First the swizzling was
wrong and this commit reimplements them.

The other issue was that these copies are generally used to download
render targets from the GPU and yuzu was not downloading them from
host GPU memory unless the extreme GPU accuracy setting was selected.
This commit enables cached memory reads for all accuracy levels.

- Fixes level thumbnails in Super Mario Maker 2.
 2020-08-10 20:45:03 -03:00
bunnei
257b1d2c4b
Merge pull request #4496 from lioncash/ce-desig 
cheat_engine: Make use of designated initializers
 2020-08-10 13:53:43 -04:00
ameerj
d6672501ac Remove UI changes 
This PR is now only the Analog devices handling the range value defaulting at 100%
 2020-08-10 12:46:14 -04:00
ameerj
9c6ae697f5 Add range slider functionality for gc adapter 2020-08-10 12:46:14 -04:00
Ameer
8928aa3008 undo unnecessary newlines, slider range 50-150 2020-08-10 12:46:14 -04:00
Ameer
504095cea9 Address c++20 warning, fix inaccurate range text display when slide == 0 2020-08-10 12:46:14 -04:00
Ameer
ed51c2abda Add range slider for analog sticks 2020-08-10 12:46:14 -04:00
bunnei
acfd771e79
Merge pull request #4491 from lioncash/unused-vars 
kernel: Remove unused variables
 2020-08-10 12:04:30 -04:00
bunnei
664019954a
Merge pull request #4488 from lioncash/file 
vfs_vector: Make creation of array vfs files less verbose
 2020-08-09 17:19:34 -04:00
Lioncash
1c3490a8db General: Tidy up clang-format warnings 2020-08-08 20:08:44 -04:00
bunnei
f14bb61acd
Merge pull request #4448 from Morph1984/fix-entries 
game_list_worker: Do not clear entries when > 1 gamedir is present
 2020-08-07 17:11:52 -04:00
bunnei
929fc849e9
Merge pull request #4457 from ogniK5377/SetScreenShotPermission 
am: Unstub SetScreenShotPermission
 2020-08-07 09:34:20 -04:00
bunnei
5429ea0e69
Merge pull request #4389 from ogniK5377/redundant-format-type 
video_core: Remove redundant pixel format type
 2020-08-07 09:33:58 -04:00
Lioncash
8e86fa7e60 common/concepts: Rename IsBaseOf to DerivedFrom 
This makes it more inline with its currently unavailable standardized
analogue std::derived_from.

While we're at it, we can also make the template match the requirements
of the standardized variant as well.
 2020-08-07 08:09:57 -04:00
bunnei
f5d538f118
Merge pull request #4483 from lioncash/constexpr-hex 
partition_data_manager: Make data arrays constexpr
 2020-08-06 23:14:14 -04:00
bunnei
5cc2f99fab
Merge pull request #4490 from lioncash/arbiter 
address_arbiter/scheduler: Resolve sign conversion warnings
 2020-08-06 22:28:11 -04:00
Lioncash
61cd7eb47d freezer: Move entry finding to its own function 
Cleans up the callsites in other functions.
 2020-08-06 03:11:21 -04:00
Lioncash
06ab28263b freezer: Take address values by value 
VAddr will always be 64-bit, so there's no need to take a trivial
primitive alias by reference.
 2020-08-06 03:04:54 -04:00
Lioncash
253a17451b freezer: Make use of std::erase_if 
With C++20 we can simplify the erasing idiom.
 2020-08-06 03:03:05 -04:00
Lioncash
5b89291308 cheat_engine: Resolve implicit bool->u64 conversion 
We can just return zero here.
 2020-08-06 02:55:47 -04:00
Lioncash
df96a214ae cheat_engine: Make use of designated initializers 
Same behavior, but makes the member being assigned obvious.
 2020-08-06 02:48:13 -04:00
Lioncash
4f2acc54f5 partition_data_manager: Update master key hashes 
Fills in some hashes that were previously unhandled.
 2020-08-06 02:42:01 -04:00
Lioncash
7f0f37fca7 partition_data_manager: Make data arrays constexpr 
Previously the constructor for all of these would run at program
startup, consuming time before the application can enter main().

This is also particularly dangerous, given the logging system wouldn't
have been initialized properly yet, yet the program would use the logs
to signify an error.

To rectify this, we can replace the literals with constexpr functions
that perform the conversion at compile-time, completely eliminating the
runtime cost of initializing these arrays.
 2020-08-06 02:41:58 -04:00
Lioncash
04bb47f57f partition_data_manager: Eliminate magic value 
We can use sizeof to make it obvious at the call site where the value is
coming from.
 2020-08-06 02:34:10 -04:00
Lioncash
09f884b7bd aes_util: Make use of non-template variant of Transcode 
Same behavior, less template instantiations.
 2020-08-06 02:31:19 -04:00
comex
d37f0b29e2 Fix thread naming on Linux, which limits names to 15 bytes. 
- In `SetCurrentThreadName`, when on Linux, truncate to 15 bytes, as (at
  least on glibc) `pthread_set_name_np` will otherwise return `ERANGE` and
  do nothing.
- Also, add logging in case `pthread_set_name_np` returns an error
  anyway.  This is Linux-specific, as the Apple and BSD versions of
  `pthread_set_name_np return `void`.
- Change the name for CPU threads in multi-core mode from
  "yuzu:CoreCPUThread_N" (19 bytes) to "yuzu:CPUCore_N" (14 bytes) so it
  fits into the Linux limit.  Some other thread names are also cut off,
  but I didn't bother addressing them as you can guess them from the
  truncated versions.  For a CPU thread, truncation means you can't see
  which core it is!
 2020-08-05 20:34:49 -07:00
bunnei
1cc0e4b4d8
Merge pull request #4489 from lioncash/typesafe 
ipc_helpers: Only allow trivially copyable objects with PushRaw() and PopRaw()
 2020-08-05 23:20:23 -04:00
bunnei
35c1607f23
Merge pull request #4484 from lioncash/aesutil 
aes_util: Allow SetIV() to be non-allocating
 2020-08-05 22:35:41 -04:00
bunnei
d888ac7d20
Merge pull request #4477 from lioncash/log-desig 
logging/backend: Make use of designated initializers
 2020-08-05 22:34:12 -04:00
Jan Beich
238208ee30 common/virtual_buffer: drop unused includes 
On DragonFly and NetBSD build fails with

src/common/virtual_buffer.cpp
src/common/virtual_buffer.cpp:16:10: fatal error: sys/sysinfo.h: No such file or directory
 #include <sys/sysinfo.h>
          ^~~~~~~~~~~~~~~
 2020-08-05 21:36:35 +00:00
bunnei
61678c4e9f
Merge pull request #4475 from lioncash/bqueue 
buffer_queue: Make use of designated initializers/std::nullopt where applicable
 2020-08-05 16:56:46 -04:00
bunnei
e8868c2ed1
Merge pull request #4479 from lioncash/concepts 
CMakeLists: Resolve #4478
 2020-08-05 16:18:08 -04:00
Lioncash
87c64c41d2 system_control: Make functions internally linked where applicable 
These functions are only ever used internally as implementation details
for GenerateRandomRange(), so these can be given internal linkage.
 2020-08-05 15:34:27 -04:00
Lioncash
a10d64ea79 kernel: Remove unused variables 
Resolves a few compiler warnings.
 2020-08-05 15:19:48 -04:00
Lioncash
9893da8e2c scheduler: Resolve sign conversion warning 2020-08-05 15:12:29 -04:00
Lioncash
1a45b15a8c address_arbiter: Resolve sign conversion warning 
Makes our type conversion explicit.
 2020-08-05 15:07:19 -04:00
bunnei
4a2d9c6454
Merge pull request #4444 from lioncash/volatile 
common/atomic_ops: Don't cast away volatile from pointers
 2020-08-05 14:22:36 -04:00
Lioncash
a77ee63f65 ipc_helpers: Only allow trivially copyable objects with PushRaw() and PopRaw() 
It's undefined behavior to use non-trivially copyable objects with
std::memcpy, so we can add asserts to catch usages of these at
compile-time.
 2020-08-05 14:08:28 -04:00
Lioncash
0a5456feb9 vfs_vector: Make creation of array vfs files less verbose 
We can add a helper function to make creation of these files nicer.
While we're at it, we can eliminate an unnecessary std::array copy in
the constructor. This makes the overhead on some of these functions way
less intensive, given some arrays were quite large.

e.g. The timezone location names are 9633 bytes in size.
 2020-08-05 12:37:00 -04:00
bunnei
07691f994a
Merge pull request #4466 from ogniK5377/loader-type-safe 
loader: Make IdentifyFile typesafe
 2020-08-05 12:34:25 -04:00
Morph
cf946312ca main: Fallback to loader if no control nca is found with patch manager 
In some rare instances, the patch manager is not able to find a control nca, fallback to the previous method of parsing a control nca through the loader if this occurs.
 2020-08-04 21:14:20 -04:00