N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15059 commits 1 branch 0 tags 109 MiB
Commit graph

13242 commits

Author SHA1 Message Date
lat9nq
136c563f76 *nix systems can read any-case patch directories 
Changes many patch_manager functions to use a case-less variant of
GetSubdirectory. Fixes patches not showing up on *nix systems when
patch directories are named with odd cases, i.e. `exeFS'.
 2020-05-27 23:12:56 -04:00
bunnei
640f0d1cec
Merge pull request #3954 from Morph1984/log-memory-amount 
main: Log host system memory parameters
 2020-05-27 22:58:51 -04:00
ReinUsesLisp
3b2dee88e6 buffer_cache: Avoid copying twice on certain cases 
Avoid copying to a staging buffer on non-granular memory addresses.
Add a callable argument to StreamBufferUpload to be able to copy to the
staging buffer directly from ReadBlockUnsafe.
 2020-05-27 23:05:50 -03:00
ReinUsesLisp
b8b6f94ba9 texture_cache: Use unordered_map::find instead of operator[] on hot code 2020-05-27 17:59:04 -03:00
bunnei
630fc12d4e
Merge pull request #3961 from Morph1984/bgra8_srgb 
maxwell_to_vk: Add format B8G8R8A8_SRGB and add Attachable capability for B8G8R8A8_UNORM
 2020-05-27 16:44:22 -04:00
ReinUsesLisp
d2b2557542 texture_cache: Use small vector for surface vectors 
This avoids most heap allocations when collecting surfaces into a
vector.
 2020-05-27 17:31:14 -03:00
ReinUsesLisp
f3f056c3b6 maxwell_3d: Initialize line widths 
Initialize line widths to avoid setting a line width of zero.
 2020-05-27 16:53:43 -03:00
ReinUsesLisp
31eb658fea maxwell_3d: Initialize polygon modes 
NVN expects this to be initialized as Fill, otherwise games that never
bind a rasterizer state will log an invalid polygon mode.
 2020-05-27 16:52:52 -03:00
Morph
b2af304918 Fix macOS code and change "Swapfile" to "Swap" 2020-05-27 11:21:59 -04:00
ReinUsesLisp
32e6727dae shader/other: Implement MEMBAR.CTS 
This silences an assertion we were hitting and uses workgroup memory
barriers when the game requests it.
 2020-05-27 00:19:45 -03:00
ReinUsesLisp
b2c4521a91 texture_cache: Fix layered null surfaces 
Null texture cubes were not considered arrays, causing issues on Vulkan
and OpenGL when creating views.
 2020-05-26 17:50:08 -03:00
ReinUsesLisp
b17fe82973 gl_texture_cache: Implement small texture view cache for swizzles 
This fixes cases where the texture swizzle was applied twice on the same
draw to a texture bound to two different slots.
 2020-05-26 17:50:08 -03:00
ReinUsesLisp
8bba84a401 texture_cache: Implement depth stencil texture swizzles 
Stop ignoring image swizzles on depth and stencil images.

This doesn't fix a known issue on Xenoblade Chronicles 2 where an OpenGL
texture changes swizzles twice before being used. A proper fix would be
having a small texture view cache for this like we do on Vulkan.
 2020-05-26 17:44:50 -03:00
ReinUsesLisp
606a62d4c7 gl_rasterizer: Port front face flip check from Vulkan 
While Vulkan was assuming we had no negative viewports, OpenGL code
was assuming we had them. Port the old code from Vulkan to OpenGL,
checking if the first viewport is negative before flipping faces.

This is not a complete implementation since we only check for the first
viewport to be negative. That said, unless a game is using Vulkan,
OpenGL and NVN games should be fine here, and we can always compare with
our Vulkan backend to see if there's a difference.
 2020-05-26 16:33:50 -03:00
ReinUsesLisp
efe7b7483b fixed_pipeline_state: Remove unnecessary check for front faces flip 
The check to flip faces when viewports are negative were a left over
from the old OpenGL code. This is not required on Vulkan where we have
negative viewports.
 2020-05-26 16:32:27 -03:00
bunnei
508242c267
Merge pull request #3981 from ReinUsesLisp/bar 
shader/other: Implement BAR.SYNC 0x0
 2020-05-26 14:40:13 -04:00
bunnei
623d9c47a2
Merge pull request #3980 from ReinUsesLisp/red-op 
shader/memory: Implement non-addition operations in RED
 2020-05-26 12:50:41 -04:00
ReinUsesLisp
c13e2f1b75 gl_shader_manager: Unbind GLSL program when binding a host pipeline 
Fixes regression in Link's Awakening caused by 420cc13248
 2020-05-26 04:20:39 -03:00
bunnei
86345c126a
Merge pull request #3978 from ReinUsesLisp/write-rz 
shader_decompiler: Visit source nodes even when they assign to RZ
 2020-05-25 21:31:33 -04:00
bunnei
1adabdac7f
Merge pull request #3905 from FernandoS27/vulkan-fix 
Correct a series of crashes and intructions on Async GPU and Vulkan Pipeline
 2020-05-24 15:23:38 -04:00
bunnei
325e7eed3c
Merge pull request #3964 from ReinUsesLisp/arb-integration 
renderer_opengl: Add assembly program code paths
 2020-05-24 00:34:12 -04:00
bunnei
487dd05170
Merge pull request #3979 from ReinUsesLisp/thread-group 
shader/other: Implement thread comparisons (NV_shader_thread_group)
 2020-05-24 00:33:06 -04:00
bunnei
6a5cf1473e
Merge pull request #3975 from ReinUsesLisp/fast-bufcache 
buffer_cache: Replace boost::icl::interval_map with boost::intrusive::set
 2020-05-24 00:32:44 -04:00
Tobias
d0a9caa08f
yuzu/discord_impl: Update the applicationID (#3977) 2020-05-22 18:26:26 +02:00
ReinUsesLisp
5d0986a53b shader/other: Implement BAR.SYNC 0x0 
Trivially implement this particular case of BAR. Unless games use OpenCL
or CUDA barriers, we shouldn't hit any other case here.
 2020-05-21 23:20:43 -03:00
ReinUsesLisp
103809a0ca shader/memory: Implement non-addition operations in RED 
Trivially implement these instructions. They are used in Astral Chain.
 2020-05-21 23:19:46 -03:00
ReinUsesLisp
e2b67a868b shader/other: Implement thread comparisons (NV_shader_thread_group) 
Hardware S2R special registers match gl_Thread*MaskNV. We can trivially
implement these using Nvidia's extension on OpenGL or naively stubbing
them with the ARB instructions to match. This might cause issues if the
host device warp size doesn't match Nvidia's. That said, this is
unlikely on proper shaders.

Refer to the attached url for more documentation about these flags.
https://www.khronos.org/registry/OpenGL/extensions/NV/NV_shader_thread_group.txt
 2020-05-21 23:18:37 -03:00
ReinUsesLisp
ed4e324991 shader_decompiler: Visit source nodes even when they assign to RZ 
Some operations like atomicMin were ignored because they returned were
being stored to RZ. This operations have a side effect and it was being
ignored.
 2020-05-21 23:16:03 -03:00
ReinUsesLisp
434856c636 vk_shader_decompiler: Don't assert for void returns 
Atomic instructions can be used without returning anything and this is
valid code. Remove the assert.
 2020-05-21 23:16:03 -03:00
ReinUsesLisp
ebaace294f buffer_cache: Remove unused boost headers 2020-05-21 16:44:00 -03:00
ReinUsesLisp
a2dcc642c1 map_interval: Add interval allocator and drop hack 
Drop the std::list hack to allocate memory indefinitely.

Instead use a custom allocator that keeps references valid until
destruction. This allocates fixed chunks of memory and puts pointers in
a free list. When an allocation is no longer used put it back to the
free list, this doesn't heap allocate because std::vector doesn't change
the capacity. If the free list is empty, allocate a new chunk.
 2020-05-21 16:44:00 -03:00
ReinUsesLisp
19d4f28001 buffer_cache: Use boost::container::small_vector for maps in range 
Most overlaps in the buffer cache only contain one mapped address.
We can avoid close to all heap allocations once the buffer cache is
warmed up by using a small_vector with a stack size of one.
 2020-05-21 16:44:00 -03:00
ReinUsesLisp
891236124c buffer_cache: Use boost::intrusive::set for caching 
Instead of using boost::icl::interval_map for caching, use
boost::intrusive::set. interval_map is intended as a container where the
keys can overlap with one another; we don't need this for caching
buffers and a std::set-like data structure that allows us to search with
lower_bound is enough.
 2020-05-21 16:44:00 -03:00
ReinUsesLisp
3b0baf746e buffer_cache: Remove shared pointers 
Removing shared pointers is a first step to be able to use intrusive
objects and keep allocations close to one another in memory.
 2020-05-21 16:02:54 -03:00
ReinUsesLisp
599274e3f0 buffer_cache: Minor style changes 
Minor style changes. Mostly done so I avoid editing it while doing other
changes.
 2020-05-21 16:02:20 -03:00
VolcaEM
cb75ccc1f7
clang-format 2020-05-21 10:43:55 +02:00
VolcaEM
235805edf3
nifm: correct assert in CreateTemporaryNetworkProfile 
This has been wrong since 0432af5ad1
I haven't found a game that called this function (and I haven't tried this on a real Switch), and because of this I haven't been able to check if the number in assert OR the string in the assert is wrong, but one of the two is wrong:
NetworkProfileData is 0x18E, while SfNetworkProfileData is 0x17C, according to Switchbrew
Switchbrew doesn't officially say that NetworkProfileData's size is 0x18E but it's possible to calculate its size since Switchbrew provides the size and the offset of all the components of NetworkProfileData (which isn't currently implemented in yuzu, alongside SfNetworkProfileData)
NetworkProfileData documentation: https://switchbrew.org/wiki/Network_Interface_services#NetworkProfileData
SfNetworkProfileData documentation: https://switchbrew.org/wiki/Network_Interface_services#SfNetworkProfileData
Since I trust ogniK's work on reversing NIFM, I'd assume this was just a typo in the string
 2020-05-21 10:23:53 +02:00
bunnei
ae61e47cba
Merge pull request #3946 from ogniK5377/sysverdat-10-0-2 
file_sys: Update SystemVersion archive to version 10.0.2
 2020-05-20 19:21:27 -04:00
ReinUsesLisp
420cc13248 renderer_opengl: Add assembly program code paths 
Add code required to use OpenGL assembly programs based on
NV_gpu_program5. Decompilation for ARB programs is intended to be added
in a follow up commit. This does **not** include ARB decompilation and
it's not in an usable state.

The intention behind assembly programs is to reduce shader stutter
significantly on drivers supporting NV_gpu_program5 (and other required
extensions). Currently only Nvidia's proprietary driver supports these
extensions.

Add a UI option hidden for now to avoid people enabling this option
accidentally.

This code path has some limitations that OpenGL compatibility doesn't
have:
- NV_shader_storage_buffer_object is limited to 16 entries for a single
OpenGL context state (I don't know if this is an intended limitation, an
specification issue or I am missing something). Currently causes issues
on The Legend of Zelda: Link's Awakening.
- NV_parameter_buffer_object can't bind buffers using an offset
different to zero. The used workaround is to copy to a temporary buffer
(this doesn't happen often so it's not an issue).

On the other hand, it has the following advantages:
- Shaders build a lot faster.
- We have control over how floating point rounding is done over
individual instructions (SPIR-V on Vulkan can't do this).
- Operations on shared memory can be unsigned and signed.
- Transform feedbacks are dynamic state (not yet implemented).
- Parameter buffers (uniform buffers) are per stage, matching NVN and
hardware's behavior.
- The API to bind and create assembly programs makes sense, unlike
ARB_separate_shader_objects.
 2020-05-19 18:00:04 -03:00
ReinUsesLisp
47a7c4f4fe yuzu: Add frontend settings for assembly shaders 
Add settings for assembly shaders. Currently hidden to avoid users from
accidentally enabled them.
 2020-05-19 17:53:17 -03:00
bunnei
cf4ee279c6
Merge pull request #3926 from ogniK5377/keyboard-states 
hid: Clear keyboard states & fix logic issue
 2020-05-19 15:55:14 -04:00
Morph
d0fc12684a maxwell_to_vk: Add format B8G8R8A8_SRGB 
Add format B8G8R8A8_SRGB and add Attachable capability for B8G8R8A8_UNORM
Used by Bravely Default II
 2020-05-18 13:02:09 -04:00
Fernando Sahmkow
4cff5dd194 OpenGL: Enable Debug Context and Synchronous debugging when graphics debugging is enabled. 
This commit aims to help easing debugging of driver crashes without
having to modify existing code.
 2020-05-17 21:45:09 -04:00
Morph
9a36d8600c main: Log host system memory parameters 
Logs both physical memory and swapfile sizes, this is useful for support.
 2020-05-17 14:45:12 -04:00
bunnei
65010607b7
Merge pull request #3665 from bunnei/device-save 
FS: Improve emulation of device saves
 2020-05-16 12:39:58 -04:00
bunnei
3c378a31b5
Merge pull request #3945 from ogniK5377/nvflinger-pixformat 
nv_flinger: Use enum for pixel format instead of u32
 2020-05-16 02:00:50 -04:00
David Marcec
17455b7222 file_sys: Update SystemVersion archive to version 10.0.2 2020-05-16 13:56:06 +10:00
David Marcec
6f0360690b nv_flinger: Use enum for pixel format instead of u32 2020-05-16 13:47:55 +10:00
David Marcec
4b9504028d DmaPusher: Remove dead code in step 2020-05-16 12:42:27 +10:00
bunnei
55c0dd1cb3
Merge pull request #3942 from ReinUsesLisp/flush-and-invalidate 
vk_rasterizer: Match OpenGL's FlushAndInvalidate behavior
 2020-05-15 21:34:07 -04:00
ReinUsesLisp
7a27b7f3a3 vk_rasterizer: Match OpenGL's FlushAndInvalidate behavior 
Match OpenGL's behavior. This can fix or simplify bisecting issues on
Vulkan.
 2020-05-15 20:40:08 -03:00
Morph
b73f678ee8 frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413) 2020-05-15 22:22:27 +02:00
bunnei
024c84d2db
Merge pull request #3927 from jroweboy/fix-bug 
Frontend: Remove tracking for context wrapper
 2020-05-14 00:07:38 -04:00
bunnei
0e2ded049d
Merge pull request #3757 from ogniK5377/better-voice-mixing 
audio_renderer: Better voice mixing and 6 channel downmixing
 2020-05-13 22:46:41 -04:00
bunnei
670a7f51e8
Merge pull request #3909 from bunnei/timezone 
Improve time zone support
 2020-05-13 21:41:45 -04:00
bunnei
b1a1bd12ca
Merge pull request #3899 from ReinUsesLisp/float-comparisons 
shader_ir: Add separate instructions for ordered and unordered comparisons and fix NE on GLSL
 2020-05-13 09:51:14 -04:00
ReinUsesLisp
91dddca26e vk_rasterizer: Implement constant attributes 
Constant attributes (in OpenGL known disabled attributes) are not
supported on Vulkan, even with extensions. To emulate this behavior we
return zero on reads from disabled vertex attributes in shader code.
This has no caching cost because attribute formats are not dynamic state
on Vulkan and we have to store it in the pipeline cache anyway.

- Fixes Animal Crossing: New Horizons terrain borders
 2020-05-13 04:36:47 -03:00
ReinUsesLisp
cf6a40fc12 vk_rasterizer: Remove buffer check in attribute selection 
This was a left over from OpenGL when disabled buffers where not properly
emulated. We no longer have to assert this as it is checked in vertex
buffer initialization.
 2020-05-13 04:36:47 -03:00
bunnei
bba54e1880 time_zone: Use std::chrono::seconds for strong typing. 2020-05-12 18:44:07 -04:00
James Rowe
1585981eec Frontend: Remove tracking for context wrapper 2020-05-11 23:50:03 -06:00
David Marcec
a79f060ea2 hid: Clear keyboard states & fix logic issue 
Previously we never cleared the states of the entries and the key would stay held down, also looping over the key bytes for each key lead to setting every bit for the key state instead of the key we wanted
 2020-05-12 12:40:50 +10:00
bunnei
1beaebe666
Merge pull request #3816 from ReinUsesLisp/vk-rasterizer-enable 
vk_graphics_pipeline: Implement rasterizer_enable on Vulkan
 2020-05-11 18:22:51 -04:00
bunnei
3c8cd62b0d hle: service: time_zone_manager: Use current time zone setting. 2020-05-11 17:55:25 -04:00
bunnei
33441fa728 common: Add module to get the current time zone. 2020-05-11 17:51:26 -04:00
bunnei
988e42a3f5 core: settings: Add a setting for time zone. 2020-05-11 17:50:07 -04:00
David Marcec
16c0373adc fix logic error & scale sample volume based on voice volume 2020-05-11 12:56:15 -04:00
David Marcec
c4e7ec7a99 pass by const ref instead 2020-05-11 12:56:15 -04:00
David Marcec
9de860a419 audio_renderer: Better voice mixing and 6 channel downmixing 
Supersedes #3738 and #3321
 2020-05-11 12:56:15 -04:00
bunnei
47b97b9577 service: fsp_srv: Stub implementation of OpenMultiCommitManager. 2020-05-11 12:54:30 -04:00
bunnei
551c61bf27 yuzu: game_list: Fix 'Open Save Data Location' for device saves. 2020-05-11 12:54:30 -04:00
bunnei
ab9ddab0a2 file_sys: savefata_factory: Update to support DeviceSaveData. 2020-05-11 12:54:30 -04:00
bunnei
9c065c013e file_sys: control_metadata: Expose device_save_data_size. 2020-05-11 12:54:30 -04:00
David Marcec
ecc8ccc9d3 Stub SendKeyboardLockKeyEvent 
Needed for Puchikon 4 SmileBASIC 1.0.0
 2020-05-12 01:01:50 +10:00
ReinUsesLisp
8b329ddcc9 gl_shader_decompiler: Properly emulate NaN behaviour on NE 
"Not equal" operators on GLSL seem to behave as unordered when we expect
an ordered comparison.

Manually emulate this checking for LGE values (numbers, not-NaNs).
 2020-05-10 02:59:33 -03:00
Fernando Sahmkow
1887afaf9e RasterizerCache: Correct documentation. 2020-05-09 21:03:39 -04:00
Fernando Sahmkow
8d15f8b28e VkPipelineCache: Use a null shader on invalid address. 2020-05-09 20:51:34 -04:00
Fernando Sahmkow
0a4be73b9b VideoCore: Use SyncGuestMemory mechanism for Shader/Pipeline Cache invalidation. 2020-05-09 19:25:29 -04:00
Rodrigo Locatti
7e376af8fc
Merge pull request #3839 from Morph1984/r8g8ui 
texture: Implement R8G8UI
 2020-05-09 05:28:55 -03:00
ReinUsesLisp
4e57f9d5cf shader_ir: Separate float-point comparisons in ordered and unordered 
This allows us to use native SPIR-V instructions without having to
manually check for NAN.
 2020-05-09 04:55:15 -03:00
bunnei
a9ee6e346b
Merge pull request #3842 from makigumo/maxwell_to_vk_vertexattribute_signed_int 
maxwell_to_vk: implement missing signed int formats
 2020-05-09 00:36:09 -04:00
James Rowe
bc30a591ba
Replace externals with Conan (#3735) 
* Remove git submodules that will be loaded through conan

* Move custom Find modules to their own folder

* Use conan for downloading missing external dependencies

* CI: Change the yuzu source folder user to the user that the containers run on

* Attempt to remove dirty mingw build hack

* Install conan on the msvc build

* Only set release build type when using not using multi config generator

* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries

* Add workaround for submodules that use legacy CMAKE variables

* Re-add USE_BUNDLED_QT on the msvc build bot
 2020-05-08 17:09:29 -04:00
bunnei
50c27d5ae1
Merge pull request #3885 from ReinUsesLisp/viewport-swizzles 
video_core: Implement viewport swizzles with NV_viewport_swizzle
 2020-05-08 15:16:53 -04:00
bunnei
1121960f0e
Merge pull request #3879 from lioncash/global2 
hle_ipc: Eliminate core memory globals
 2020-05-07 19:13:34 -04:00
bunnei
028f6fdbf6
Merge pull request #3884 from ReinUsesLisp/border-colors 
vk_sampler_cache: Use VK_EXT_custom_border_color when available
 2020-05-07 12:18:53 -04:00
FearlessTobi
9e5af4ad30 Menubar: fix mouse tracking bug 
Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
 2020-05-06 22:14:52 +02:00
bunnei
41682e0888
Merge pull request #3815 from FernandoS27/command-list-2 
GPU: More optimizations to GPU Command List Processing and DMA Copy Optimizations
 2020-05-05 17:12:42 -04:00
bunnei
88141bb2d4
Merge pull request #3881 from lioncash/mem-warning 
kernel/memory: Resolve several compiler warnings
 2020-05-05 15:41:18 -04:00
bunnei
eb2c50c5e6
Update src/video_core/gpu.cpp 
Co-authored-by: David <25727384+ogniK5377@users.noreply.github.com>
 2020-05-05 15:39:44 -04:00
bunnei
ea09930196
Update src/video_core/gpu.cpp 
Co-authored-by: David <25727384+ogniK5377@users.noreply.github.com>
 2020-05-05 15:39:37 -04:00
ReinUsesLisp
227278098a vk_sampler_cache: Use VK_EXT_custom_border_color when available 
This should fix grass interactions on Breath of the Wild on Vulkan.
It is currently untested against validation layers.

Nvidia's Windows 443.09 beta driver or Linux 440.66.12 is required for
now.
 2020-05-04 20:49:23 -03:00
bunnei
929acd4d1e
Merge pull request #3880 from lioncash/encoding 
kernel/memory: Amend potential encoding warnings
 2020-05-04 18:50:29 -04:00
ReinUsesLisp
2dbf5290f2 vk_graphics_pipeline: Implement viewport swizzles with NV_viewport_swizzle 2020-05-04 18:31:17 -03:00
ReinUsesLisp
f813cd3ff7 gl_rasterizer: Implement viewport swizzles with NV_viewport_swizzle 2020-05-04 17:51:30 -03:00
ReinUsesLisp
9b8e962368 maxwell_3d: Add viewport swizzles 2020-05-04 17:50:59 -03:00
bunnei
500e9c5969
Merge pull request #3843 from ogniK5377/GetPopFromGeneralChannelEvent 
am: IHomeMenuFunctions:GetPopFromGeneralChannelEvent
 2020-05-04 16:20:11 -04:00
bunnei
fc04108c77
Merge pull request #3637 from FearlessTobi/port-5094 
Port citra-emu/citra#5094: "yuzu: Option to hide mouse on inactivity"
 2020-05-03 23:16:19 -04:00
bunnei
29fce1a187
Merge pull request #3822 from ogniK5377/GetAccountId 
acc: Return a unique value per account for GetAccountId
 2020-05-03 23:15:03 -04:00
Lioncash
4620580245 kernel/memory: Remove #pragma once within cpp file 
This isn't necessary in a cpp file and will cause warnings on clang.
 2020-05-03 13:42:07 -04:00
Lioncash
1ecaa86a52 kernel/memory: Remove unused includes 
Prevents header churn and needing to recompile these files if these
headers are ever changed in the future.
 2020-05-03 13:41:18 -04:00
Lioncash
a2e61e6542 kernel/memory: Remove unused variables in memory_block_manager 
Prevents unused variable warnings.
 2020-05-03 13:36:20 -04:00
Lioncash
26aee55aef kernel/memory: Make use of std::array consistently in address_space_info 
This allows tuning standard library implementations to enable or disable
range checks at runtime, which is nicer for debugging.
 2020-05-03 13:34:24 -04:00
Lioncash
dfa582169b kernel/memory: Resolve -Wshadow warnings 
Prevents variable name clashing.
 2020-05-03 13:29:42 -04:00
Lioncash
93c083aef1 kernel/memory: Amend potential encoding warnings 
While èis generally representable in some language encodings, in some
it isn't and will result in compilation warnings occurring. To remain
friendly with other language's codepages on Windows, we normalize it to
an ASCII e.
 2020-05-03 13:01:03 -04:00
Lioncash
0ec07e8763 hle_ipc: Eliminate core memory globals 
We can just pass the required instances into the constructor of the
request, eliminating all usages of the global system accessor.
 2020-05-03 12:57:40 -04:00
Morph
3cfa7a89e0
settings: Add anisotropic filtering level to the yuzu configuration log (#3875) 2020-05-03 17:42:17 +02:00
bunnei
2aff0b4733
Merge pull request #3808 from ReinUsesLisp/wait-for-idle 
{maxwell_3d,buffer_cache}: Implement memory barriers using 3D registers
 2020-05-03 02:43:18 -04:00
Mat M
3309a6cdf1
Merge pull request #3872 from FearlessTobi/reopen-3792 
input_common: fix build when SDL2 is disabled
 2020-05-03 01:01:11 -04:00
bunnei
8db4feb5b4
Merge pull request #3871 from lioncash/semi 
readable_event: Remove unnecessary semicolon in Signal()
 2020-05-02 23:38:36 -04:00
bunnei
7459215933
Merge pull request #3824 from ogniK5377/GetDisplayVersion 
am: Properly implement GetDisplayVersion
 2020-05-02 23:35:38 -04:00
bunnei
c49f51eaf1
Update src/core/hle/service/am/am.cpp 
Co-authored-by: Mat M. <mathew1800@gmail.com>
 2020-05-02 23:35:31 -04:00
FearlessTobi
3d1e741645 input_common: fix build when SDL2 is disabled 2020-05-02 21:47:17 +02:00
Lioncash
aabf5b2059 readable_event: Remove unnecessary semicolon in Signal() 
Resolves a -Wextra-semi warning.

While we're at it, we can invert the branch to form a guard clause,
unindenting all of the contained code.
 2020-05-02 14:07:31 -04:00
bunnei
30bd77c6e7
Merge pull request #3811 from ogniK5377/audin-init 
audin:u: ListAudioIns, OpenAudioIn, ListAudioInsAuto, OpenAudioInAuto, ListAudioInsAutoFiltered, OpenAudioInProtocolSpecified
 2020-05-02 13:11:52 -04:00
bunnei
5ddcc1b2f5
Merge pull request #3819 from ogniK5377/err-log2 
kernel: Don't fail silently
 2020-05-02 02:51:50 -04:00
bunnei
f4ca8e0d3e
Merge pull request #3732 from lioncash/header 
vulkan: Remove unnecessary includes
 2020-05-02 01:36:57 -04:00
bunnei
0128901102
Merge pull request #3809 from ReinUsesLisp/empty-index 
vk_rasterizer: Skip index buffer setup when vertices are zero
 2020-05-02 01:21:57 -04:00
ReinUsesLisp
3b668e1210 vk_graphics_pipeline: Implement rasterizer_enable on Vulkan 
We can simply enable rasterizer discard matching the current pipeline
key.
 2020-05-02 01:47:25 -03:00
bunnei
e6b4311178
Merge pull request #3693 from ReinUsesLisp/clean-samplers 
shader/texture: Support multiple unknown sampler properties
 2020-05-02 00:45:41 -04:00
Mat M
5f2a9a4c86
Merge pull request #3859 from jbeich/clang 
Unbreak build with Clang < 10
 2020-05-01 23:39:12 -04:00
bunnei
1bcdf5e61c
Merge pull request #3833 from qwell/caps_su-32-stub 
Add stub for caps:su SetShimLibraryVersion
 2020-05-01 23:34:05 -04:00
bunnei
fd005585f6
Merge pull request #3821 from ogniK5377/InitializeApplicationInfo-fix 
acc: Fix InitializeApplicationInfo
 2020-05-01 22:06:05 -04:00
bunnei
224cf3075c
Merge pull request #3812 from ogniK5377/lisst-qualified-users 
account: ListQualifiedUsers
 2020-05-01 22:05:37 -04:00
Jan Beich
b4d0724a63 fixed_pipeline_state: explicitly use template keyword after 1f345ebe3a 
In file included from src/video_core/renderer_opengl/renderer_opengl.cpp:25:
In file included from src/./video_core/renderer_opengl/gl_rasterizer.h:26:
In file included from src/./video_core/renderer_opengl/gl_fence_manager.h:11:
src/./video_core/fence_manager.h:91:32: error: use 'template' keyword
      to treat 'Write' as a dependent template name
                memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
                               ^
                               template
src/./video_core/fence_manager.h:137:32: error: use 'template'
      keyword to treat 'Write' as a dependent template name
                memory_manager.Write<u32>(current_fence->GetAddress(), current_fence->GetPayload());
                               ^
                               template
 2020-05-01 23:38:23 +00:00
David Marcec
d5a69ecb68 nvdrv: Fix GetGpuTime stack corruption 
IoctlGetGpuTime should be 16 bytes, not 8.
 2020-05-02 00:14:37 +10:00
David Marcec
8850d85341 am: IHomeMenuFunctions:GetPopFromGeneralChannelEvent 
QLaunch 1.0.0
 2020-05-01 11:20:43 +10:00
Dan
96ee1b42bc maxwell_to_vk: implement missing signed int formats 2020-04-30 23:39:16 +02:00
Jason Parker
4b16e93f1a caps:su Stub out SetShimLibraryVersion 
Used by Animal Crossing: New Horizons when trying to take a picture.
 2020-04-30 15:16:53 -04:00
Mat M
f88d2f5739
Merge pull request #3823 from ogniK5377/setvrmode 
am: IsVrModeEnabled & SetVrModeEnabled fixes
 2020-04-30 13:39:16 -04:00
Mat M
ecf1f2e054
Merge pull request #3830 from ogniK5377/GetFriendInvitationStorageChannelEvent 
am: GetFriendInvitationStorageChannelEvent
 2020-04-30 13:38:35 -04:00
Mat M
0a0b676286
Merge pull request #3835 from ogniK5377/GetFreeSpaceSize-GetTotalSpaceSize 
fs-srv: GetFreeSpaceSize & GetTotalSpaceSize
 2020-04-30 13:37:43 -04:00
Mat M
07552d4615
Merge pull request #3832 from ogniK5377/nim-eca-CreateServerInterface 
nim: CreateServerInterface, CreateAccessorInterface, CreateAsyncInterface
 2020-04-30 13:36:04 -04:00
Mat M
e6f4251988
Merge pull request #3831 from ogniK5377/caps-su-names 
caps: Add missing service names to caps:su
 2020-04-30 13:32:53 -04:00
Morph
7909860d16 texture: Implement R8G8UI 
- Used by The Walking Dead: The Final Season
 2020-04-30 13:19:36 -04:00
bunnei
96cd5dce85
Merge pull request #3825 from ogniK5377/psm-no-warn 
psm: Mark as debug instead of warning
 2020-04-30 13:11:11 -04:00
bunnei
bf3f030a0d
Merge pull request #3807 from ReinUsesLisp/fix-depth-clamp 
maxwell_3d: Fix depth clamping register
 2020-04-30 13:07:31 -04:00
bunnei
c7b5a87c90
Merge pull request #3799 from ReinUsesLisp/iadd-cc 
shader: Implement P2R CC, IADD Rd.CC and IADD.X
 2020-04-30 12:56:36 -04:00
bunnei
da2b8295e1
Merge pull request #3805 from ReinUsesLisp/preserve-contents 
texture_cache: Reintroduce preserve_contents accurately
 2020-04-30 12:56:19 -04:00
bunnei
6572660fde
Merge pull request #3788 from FernandoS27/revert 
Revert: shader_decode: Fix LD, LDG when track constant buffer.
 2020-04-30 12:55:39 -04:00
David Marcec
78e5f162e2 fs-srv: GetFreeSpaceSize & GetTotalSpaceSize 
Closes #3533

Turns out the functions were already implemented but just never added
 2020-04-30 23:59:57 +10:00
David Marcec
55e423c8b6 nim: CreateServerInterface, CreateAccessorInterface, CreateAsyncInterface 
Closes #3026
 2020-04-30 23:10:20 +10:00
David Marcec
738140fdd8 caps: Add missing service names to caps:su 
SetShimLibraryVersion, SaveScreenShotEx1 & SaveScreenShotEx2 were missing
 2020-04-30 22:51:06 +10:00
David Marcec
10804d6d0e am: GetFriendInvitationStorageChannelEvent 
Closes #3829
 2020-04-30 22:37:26 +10:00
David Marcec
973c40b63e psm: Mark as debug instead of warning 
No point to emulate battery life. However options are broken out if we ever want to add a setting for it
 2020-04-29 22:39:49 +10:00
David Marcec
9acd336422 am: Properly implement GetDisplayVersion 
Properly implement IApplicationFunctions::GetDisplayVersion
 2020-04-29 22:13:56 +10:00
David Marcec
8bddc750e2 am: IsVrModeEnabled & SetVrModeEnabled fixes 
Return the proper state of vr mode for IsVrModeEnabled
We should not return an error for SetVrModeEnabled. When VR Mode is turned on, it signals to lbl to turn vr mode on, not return an error code
 2020-04-29 21:48:58 +10:00
David Marcec
1417849a2b acc: Return a unique value per account for GetAccountId 2020-04-29 21:09:53 +10:00
David Marcec
1fbc341aba acc: Fix InitializeApplicationInfo 
We're not suppose to pop a u64, should just read the sent pid and check that
 2020-04-29 20:49:35 +10:00
David Marcec
b6538c3e7c kernel: Don't fail silently 2020-04-29 14:53:53 +10:00
Lioncash
6c53edd4d3 vulkan: Remove unnecessary includes 
Reduces some header churn and reduces rebuilds when some header
internals change.

While we're at it we can also resolve a missing include in buffer_cache.
 2020-04-28 21:54:46 -04:00
bunnei
8e64fb3225
Merge pull request #3771 from benru/dump-romfs-with-updates 
Dump RomFS command to include Updates
 2020-04-28 21:54:06 -04:00
Mat M
c3c3e07263
Merge pull request #3818 from ogniK5377/err-log 
Don't fail silently for vi, sm, set and ns services
 2020-04-28 21:41:13 -04:00
Mat M
5cb531b6cf
Merge pull request #3783 from lioncash/pointer 
physical_core: Make use of std::make_unique instead of std::make_shared in ctor
 2020-04-28 21:38:02 -04:00
David Marcec
b4dbf1b9c7 Don't fail silently for vi, sm, set and ns services 2020-04-29 11:15:21 +10:00
ReinUsesLisp
871aadbe36 shader/arithmetic_integer: Fix tracking issue in temporary 
This temporary is not needed as we mark Rd.CC + IADD.X as unimplemented.
It caused issues when tracking global buffers.
 2020-04-28 17:14:53 -03:00
Fernando Sahmkow
9df67b2095 Clang Format and Documentation. 2020-04-28 14:02:51 -04:00
Fernando Sahmkow
37c690576f MaxwellDMA: Optimize micro copies. 2020-04-28 13:44:14 -04:00
bunnei
72b73d22ab
Merge pull request #3784 from ReinUsesLisp/shader-memory-util 
shader/memory_util: Deduplicate code
 2020-04-28 12:05:50 -04:00
David Marcec
2261cf24af kernel: Bad GetInfo ids should not be marked as stubs 
As we currently match hardware and don't return a successful result, these should be marked as errors instead of warnings and as stubs.
 2020-04-29 01:17:59 +10:00
David Marcec
fdbeb90bd0 Updated comment to reflect ListQualifiedUsers better 2020-04-29 01:13:03 +10:00
David Marcec
0f6064e5c9 style: Change AMs & Glues error codes to be dec instead of hex 
Consistency for the rest of the error codes in the codebase
 2020-04-29 00:49:49 +10:00
David Marcec
1276e425d2 marked stubs 2020-04-29 00:43:05 +10:00
David Marcec
a17813c4f4 account: ListQualifiedUsers 
Closes #2844
 2020-04-29 00:37:47 +10:00
David Marcec
fb51a655b8 Audin:u ListAudioIns, OpenAudioIn, ListAudioInsAuto, OpenAudioInAuto, ListAudioInsAutoFiltered, OpenAudioInProtocolSpecified 
Closes #2874
 2020-04-29 00:19:07 +10:00
ReinUsesLisp
d6a24b4a5b vk_rasterizer: Skip index buffer setup when vertices are zero 
Xenoblade 2 invokes a draw call with zero vertices.
This is likely due to indirect drawing (glDrawArraysIndirect).

This causes a crash in the staging buffer pool when trying to create a
buffer with a size of zero. To workaround this, skip index buffer setup
entirely when the number of indices is zero.
 2020-04-28 02:24:33 -03:00
ReinUsesLisp
fe931ac976 {maxwell_3d,buffer_cache}: Implement memory barriers using 3D registers 
Drop MemoryBarrier from the buffer cache and use Maxwell3D's register
WaitForIdle.

To implement this on OpenGL we just call glMemoryBarrier with the
necessary bits.

Vulkan lacks this synchronization primitive, so we set an event and
immediately wait for it. This is not a pretty solution, but it's what
Vulkan can do without submitting the current command buffer to the queue
(which ends up being more expensive on the CPU).
 2020-04-28 02:18:12 -03:00
Fernando Sahmkow
b87422a86f VideoCore/GPU: Delegate subchannel engines to the dma pusher. 2020-04-27 22:07:21 -04:00
Fernando Sahmkow
90e5694230 VideoCore/Engines: Refactor Engines CallMethod. 2020-04-27 21:47:58 -04:00
ReinUsesLisp
bb1ed66d99 maxwell_3d: Fix depth clamping register 
Using deko3d as reference:
4e47ba0013/source/maxwell/gpu_3d_state.cpp (L42)

We were using bits 3 and 4 to determine depth clamping, but these are
the same both enabled and disabled:

state->depthClampEnable ? 0x101A : 0x181D

The same happens on Nvidia's OpenGL driver, where they do something like
this (default capabilities, GL 4.5 compatibility):

(state & DEPTH_CLAMP) != 0 ? 0x201a : 0x281c

There's always a difference between the first bits in this register, but
bit 11 is consistently disabled on both deko3d/NVN and OpenGL. This
commit changes yuzu's behaviour to use bit 11 to determine depth
clamping.

- Fixes depth issues on Super Mario Odyssey's intro.
 2020-04-27 20:50:14 -03:00
bunnei
4dca2298f9
Merge pull request #3785 from ogniK5377/set-buffer-count-unit 
vi: Don't let uninitialized data pass as a response for SetBufferCount
 2020-04-27 17:10:28 -04:00
Fernando Sahmkow
1517cba8ca
Merge pull request #3766 from ReinUsesLisp/renderpass-cache-key 
vk_renderpass_cache: Pack renderpass cache key and unify keys
 2020-04-27 16:05:14 -04:00
Fernando Sahmkow
a65e9ad552
Merge pull request #3756 from ReinUsesLisp/integrated-devices 
vk_memory_manager: Remove unified memory model flag
 2020-04-27 16:04:22 -04:00
Mat M
e8e04a4b80
Merge pull request #3797 from slashiee/hid-stub 
services: hid: Stub StopSevenSixAxisSensor.
 2020-04-27 15:37:08 -04:00
bunnei
6c7d8073be
Merge pull request #3742 from FernandoS27/command-list 
Optimize GPU Command Lists and Introduce Fast GPU Time Option
 2020-04-27 00:18:46 -04:00
ReinUsesLisp
8da16cf9fb texture_cache: Reintroduce preserve_contents accurately 
This reverts commit 94b0e2e5da.

preserve_contents proved to be a meaningful optimization. This commit
reintroduces it but properly implemented on OpenGL.

We have to make sure the clear removes all the previous contents of the
image.

It's not currently implemented on Vulkan because we can do smart things
there that's preferred to be introduced in a separate commit.
 2020-04-26 19:53:02 -03:00
bunnei
378aed07e9
Merge pull request #3795 from vitor-k/fix-folder 
Fix "Port citra-emu/citra#4956: "Fixes to game list sorting" #3611"
 2020-04-26 13:55:26 -04:00
bunnei
11e1629d89
Merge pull request #3744 from lioncash/table2 
service: Update function tables
 2020-04-26 04:15:47 -04:00
Rodrigo Locatti
7e38dd580f
Merge pull request #3753 from ReinUsesLisp/ac-vulkan 
{gl,vk}_rasterizer: Add lazy default buffer maker and use it for empty buffers
 2020-04-26 01:55:43 -03:00
ReinUsesLisp
ddd82ef42b shader/memory_util: Deduplicate code 
Deduplicate code shared between vk_pipeline_cache and gl_shader_cache as
well as shader decoder code.

While we are at it, fix a bug in gl_shader_cache where compute shaders
had an start offset of a stage shader.
 2020-04-26 01:38:51 -03:00
bunnei
9bd70c52e5
Merge pull request #3791 from Kewlan/hotkey-config-plus 
configuration: Add Restore Default and Clear options to hotkeys
 2020-04-26 00:33:08 -04:00
bunnei
ccda5ffa58
Merge pull request #3761 from Kewlan/stick-modifier-slider 
configure_input_player: Use slider to edit modifier scale
 2020-04-25 22:55:41 -04:00
ReinUsesLisp
e895a4e2d7 shader/arithmetic_integer: Fix edge case and mark IADD.X Rd.CC as unimplemented 
IADD.X Rd.CC requires some extra logic that is not currently
implemented. Abort when this is hit.
 2020-04-25 22:58:33 -03:00
ReinUsesLisp
2a96bea6a7 shader/arithmetic_integer: Change IAdd to UAdd to avoid signed overflow 
Signed integer addition overflow might be undefined behavior. It's free
to change operations to UAdd and use unsigned integers to avoid
potential bugs.
 2020-04-25 22:57:54 -03:00
ReinUsesLisp
c788f9c0bd shader/arithmetic_integer: Implement IADD.X 
IADD.X takes the carry flag and adds it to the result. This is generally
used to emulate 64-bit operations with 32-bit registers.
 2020-04-25 22:56:11 -03:00
ReinUsesLisp
255197e643 shader/arithmetic_integer: Implement CC for IADD 2020-04-25 22:55:26 -03:00
ReinUsesLisp
ffc5ec6fa8 decode/register_set_predicate: Implement CC 
P2R CC takes the state of condition codes and puts them into a register.
We already have this implemented for PR (predicates). This commit
implements CC over that.
 2020-04-25 22:54:42 -03:00
ReinUsesLisp
d523734266 decode/register_set_predicate: Use move for shared pointers 
Avoid atomic counters used by shared pointers.
 2020-04-25 22:54:14 -03:00
M&M
c1ffaa8b29 services: hid: Stub StopSevenSixAxisSensor. 
- Used by The Legend of Zelda: Breath of the Wild v1.6.0
 2020-04-25 15:38:56 -07:00
Vitor Kiguchi
dffcff9fec Fix the mistake in the port and update the comment for clarity 2020-04-25 15:01:20 -03:00
bunnei
c5bf693882
Merge pull request #3721 from ReinUsesLisp/sort-devices 
vulkan/wrapper: Sort physical devices
 2020-04-25 03:27:40 -04:00
bunnei
4e37825dab
Merge pull request #3734 from ReinUsesLisp/half-float-mods 
decode/arithmetic_half: Fix HADD2 and HMUL2 absolute and negation bits
 2020-04-25 00:41:43 -04:00
bunnei
d1e7cf3bdc
Merge pull request #3780 from lioncash/process 
svc: Re-add MapProcessCodeMemory/UnmapProcessCodeMemory
 2020-04-24 23:22:26 -04:00
ReinUsesLisp
527a1574c3 vk_rasterizer: Pack texceptions and color formats on invalid formats 
Sometimes for unknown reasons NVN games can bind a render target format
of 0. This may be a yuzu bug.

With the commits before this the formats were specified without being
"packed", assuming all formats and texceptions will be written like in
the color_attachments vector.

To address this issue, iterate all render targets and pack them as they
are valid. This way they will match color_attachments.

- Fixes validation errors and graphical issues on Breath of the Wild.
 2020-04-24 22:21:29 -03:00
Kewlan
a19c6317ef Add Restore Defaults and Clear options to hotkeys 2020-04-24 23:50:26 +02:00
bunnei
7c8acb0025
Merge pull request #3749 from ReinUsesLisp/lea-imm 
shader/arithmetic_integer: Fix LEA_IMM encoding
 2020-04-24 14:30:13 -04:00
Fernando Sahmkow
d8a961cd6c Revert: shader_decode: Fix LD, LDG when track constant buffer. 2020-04-24 11:00:54 -04:00
Markus Wick
e717a1df20 Fix -Wdeprecated-copy warning. 2020-04-24 09:33:04 +02:00
Markus Wick
c499c22cf7 Fix -Werror=conversion error. 2020-04-24 09:33:04 +02:00
David Marcec
03a6f3b0f4 vi: Don't let uninitialized data pass as a response for SetBufferCount 
Currently SetBufferCount doesn't write to the out buffer which then contains uninitialized data. This leads to non-zero data which leads to responding with different error codes
 2020-04-24 17:24:58 +10:00
bunnei
8f548266cd
Merge pull request #3760 from Morph1984/trailing-filedir-separator 
frontend/filesystem: Add a trailing separator to the string path
 2020-04-24 01:44:32 -04:00
Lioncash
cc84b48ce5 physical_core: Make use of std::make_unique instead of std::make_shared in ctor 
We can also allow unicorn to be constructed in 32-bit mode or 64-bit
mode to satisfy the need for both interpreter instances.

Allows this code to compile successfully of non x86-64 architectures.
 2020-04-24 00:20:58 -04:00
Rodrigo Locatti
f24c67877b
Merge pull request #3777 from lioncash/warn 
page_table: Remove unused captures
 2020-04-23 21:47:54 -03:00
Rodrigo Locatti
db3dcb2f64
Merge pull request #3778 from lioncash/unused-var 
svc: Remove unused variable
 2020-04-23 21:47:24 -03:00
Lioncash
ce7c02735e shared_memory: Amend doxygen reference 
Amends the parameter to match the documentation reference.

Resolves a -Wdocumentation warning with clang.
 2020-04-23 18:42:14 -04:00
Lioncash
4730347f8e svc: Re-add MapProcessCodeMemory/UnmapProcessCodeMemory 
These were lost in the re-implementation of the virtual memory manager.
 2020-04-23 18:12:04 -04:00
Lioncash
bed4865981 svc: Remove unused variable 
Since the VMM refactor, this is no longer used or needed.
 2020-04-23 17:53:26 -04:00
Lioncash
f77b5dfe81 page_table: Remove unused captures 
Any time the lambda function is called, the permission being used in the
capture would be passed in as an argument to the lambda, so the capture
is unnecessary.
 2020-04-23 17:33:08 -04:00
ReinUsesLisp
dbaebd8582 decode/arithmetic_half: Fix HADD2 and HMUL2 absolute and negation bits 
The encoding for negation and absolute value was wrong.
Extracting is now done manually. Similar instructions having different
encodings is the rule, not the exception. To keep sanity and readability
I preferred to extract the desired bit manually.

This is implemented against nxas:
8dbc389957/table.h (L68)

That is itself tested against nvdisasm (Nvidia's official disassembler).
 2020-04-23 18:29:38 -03:00
ReinUsesLisp
4fb921ff6b shader/texture: Support multiple unknown sampler properties 
This allows deducing some properties from the texture instruction before
asking the runtime. By doing this we can handle type mismatches in some
instructions from the renderer instead of the shader decoder.

Fixes texelFetch issues with games using 2D texture instructions on a 1D
sampler.
 2020-04-23 18:04:13 -03:00
ReinUsesLisp
72deb773fd shader_ir: Turn classes into data structures 2020-04-23 18:00:06 -03:00
ReinUsesLisp
3e35101895 vk_rasterizer: Fix framebuffer creation validation errors 
Framebuffer creation was ignoring the number of color attachments.
 2020-04-23 17:34:16 -03:00
ReinUsesLisp
8c37cd1af6 vk_pipeline_cache: Unify pipeline cache keys into a single operation 
This allows us to call Common::CityHash and std::memcmp only once for
GraphicsPipelineCacheKey. While we are at it, do the same for compute.
 2020-04-23 17:34:16 -03:00
ReinUsesLisp
f665c92114 vk_renderpass_cache: Pack renderpass cache key to 12 bytes 2020-04-23 17:34:16 -03:00
Rodrigo Locatti
26f2820ae3
Merge pull request #3768 from H27CK/cmd-title-fmt 
Fix format error in performance statistics
 2020-04-23 16:14:33 -03:00
bunnei
ff0c49e1ce
kernel: memory: Improve implementation of device shared memory. (#3707) 
* kernel: memory: Improve implementation of device shared memory.

* fixup! kernel: memory: Improve implementation of device shared memory.

* fixup! kernel: memory: Improve implementation of device shared memory.
 2020-04-23 11:37:12 -04:00
Fernando Sahmkow
5c9feaebb6 Clang Format. 2020-04-23 08:52:58 -04:00
Fernando Sahmkow
b8aef40c56 GPU: Add Fast GPU Time Option. 2020-04-23 08:52:57 -04:00
Fernando Sahmkow
18a88d19dc Maxwell3D: Process Macros on MultiMethod. 2020-04-23 08:52:56 -04:00
Fernando Sahmkow
3fedcc2f6e DMAPusher: Propagate multimethod writes into the engines. 2020-04-23 08:52:55 -04:00
Ben Russell
bcd0444bb9
Update src/yuzu/main.cpp with missing const 
Co-Authored-By: Mat M. <mathew1800@gmail.com>
 2020-04-23 13:10:06 +01:00
Ben Russell
dd43d725c6
Dump RomFS command to include Updates 
Patch the RomFS with the selected updates before dumping. Previously the resulting RomFS only contained data from the original title.

To dump the RomFS without updates the user can disable the update under Properties before choosing Dump RomFS.
 2020-04-23 13:06:18 +01:00
bunnei
eb26e9e711
Merge pull request #3730 from lioncash/time 
service/time: Remove reliance on the global system accessor
 2020-04-23 02:41:38 -04:00
bunnei
2409fedacf
Merge pull request #3697 from lioncash/declarations 
CMakeLists: Enable -Wmissing-declarations on Linux builds
 2020-04-23 02:18:52 -04:00
Kewlan
8d917e14f8 Edit modifier_scale with the deadzone slider 2020-04-23 06:32:39 +02:00
H27CK
a26a725515 Fix format error in performance statistics 
Formatting
 2020-04-23 04:31:26 +02:00
bunnei
bf2ddb8fd5
Merge pull request #3677 from FernandoS27/better-sync 
Introduce Predictive Flushing and Improve ASYNC GPU
 2020-04-22 22:09:38 -04:00
Mat M
2c806c5fd3
Merge pull request #3767 from ReinUsesLisp/point-size-pipeline 
vk_pipeline_cache: Fix unintentional memcpy into optional
 2020-04-22 21:20:14 -04:00
ReinUsesLisp
d9463f4562 vk_pipeline_cache: Fix unintentional memcpy into optional 
The intention behind this was to assign a float to from an uint32_t, but
it was unintentionally being copied directly into the std::optional.

Copy to a temporary and assign that temporary to std::optional. This can
be replaced with std::bit_cast<float> once we are in C++20.
 2020-04-22 21:36:05 -03:00
Fernando Sahmkow
c043ac4f13 GL_Fence_Manager: use GL_TIMEOUT_IGNORED instead of a loop, 2020-04-22 20:34:32 -04:00
bunnei
bee2c64b34
Merge pull request #3725 from MerryMage/fpcr 
thread: FPCR.FZ is likely not 1 (and FPCR.RMode = TieAway and FPCR.DN = 0)
 2020-04-22 19:49:13 -04:00
Fernando Sahmkow
63d2ba4f69
Merge pull request #3763 from H27CK/vk-cmd 
Add missing ;
 2020-04-22 17:43:42 -04:00
H27CK
4d74578d35 Add missing ; 2020-04-22 23:36:21 +02:00
bunnei
5ed13304e1
Merge pull request #3758 from H27CK/vk-cmd 
Introduce dummy context for yuzu-cmd VK support
 2020-04-22 12:37:01 -04:00
Fernando Sahmkow
afae40a99e
Merge pull request #3653 from ReinUsesLisp/nsight-aftermath 
renderer_vulkan: Integrate Nvidia Nsight Aftermath on Windows
 2020-04-22 11:39:01 -04:00
Fernando Sahmkow
4e37f1b113 Address Feedback. 2020-04-22 11:36:27 -04:00
Fernando Sahmkow
39e5b72948 Async GPU: Correct flushing behavior to be similar to old async GPU behavior. 2020-04-22 11:36:26 -04:00
Fernando Sahmkow
1b3be8a8f8 MaxwellDMA: Correct copying on accuracy level. 2020-04-22 11:36:25 -04:00
Fernando Sahmkow
644588fd88 ShaderCache/PipelineCache: Cache null shaders. 2020-04-22 11:36:25 -04:00
Fernando Sahmkow
f616dc0b59 Address Feedback. 2020-04-22 11:36:24 -04:00
Fernando Sahmkow
ec2f3e48e1 Fix GCC error. 2020-04-22 11:36:23 -04:00
Fernando Sahmkow
7f44f22451 Correct Linux Compile Error. 2020-04-22 11:36:22 -04:00
Fernando Sahmkow
d2d4a6cbcf Clang format. 2020-04-22 11:36:22 -04:00
Fernando Sahmkow
b3e5f177ba QueryCache: Only do async flushes on async gpu. 2020-04-22 11:36:21 -04:00
Fernando Sahmkow
f4ab223ef0 Async GPU: Only do reactive flushing on Extreme Level. 2020-04-22 11:36:20 -04:00
ReinUsesLisp
b752faf2d3 vk_fence_manager: Initial implementation 2020-04-22 11:36:19 -04:00
Fernando Sahmkow
0649f05900 QueryCache: Implement Async Flushes. 2020-04-22 11:36:18 -04:00
Fernando Sahmkow
131b342130 OpenGL: Guarantee writes to Buffers. 2020-04-22 11:36:18 -04:00
Fernando Sahmkow
1fb516cd97 GPU: Implement Flush Requests for Async mode. 2020-04-22 11:36:17 -04:00
Fernando Sahmkow
b7bc3c2549 FenceManager: Manage syncpoints and rename fences to semaphores. 2020-04-22 11:36:16 -04:00
Fernando Sahmkow
96bb961a64 BufferCache: Refactor async managing. 2020-04-22 11:36:15 -04:00
Fernando Sahmkow
b10db7e4a5 FenceManager: Implement async buffer cache flushes on High settings 2020-04-22 11:36:15 -04:00
Fernando Sahmkow
4adfc9bb08 Rasterizer: Document SignalFence & ReleaseFences and setup skeletons on Vulkan. 2020-04-22 11:36:14 -04:00
Fernando Sahmkow
a081a7c855 GPU: Fix rebase errors. 2020-04-22 11:36:13 -04:00
Fernando Sahmkow
e84eb64e51 Rasterizer: Disable fence managing in synchronous gpu. 2020-04-22 11:36:12 -04:00
Fernando Sahmkow
165ae823f5 ThreadManager: Sync async reads on accurate gpu. 2020-04-22 11:36:12 -04:00
Fernando Sahmkow
57fdbd9b89 FenceManager: Implement should wait. 2020-04-22 11:36:11 -04:00
Fernando Sahmkow
1f345ebe3a GPU: Implement a Fence Manager. 2020-04-22 11:36:10 -04:00
Fernando Sahmkow
487379c593 OpenGL: Implement Fencing backend. 2020-04-22 11:36:10 -04:00
Fernando Sahmkow
ed7e965712 TextureCache: Flush linear textures after finishing rendering. 2020-04-22 11:36:09 -04:00
Fernando Sahmkow
339d0d9d6c GPU: Delay Fences. 2020-04-22 11:36:08 -04:00
Fernando Sahmkow
8b1eb44b3e BufferCache: Implement OnCPUWrite and SyncGuestHost 2020-04-22 11:36:07 -04:00
Fernando Sahmkow
da8f17715d GPU: Refactor synchronization on Async GPU 2020-04-22 11:36:06 -04:00
Fernando Sahmkow
a60a22d9c2 Texture Cache: Implement OnCPUWrite and SyncGuestHost 2020-04-22 11:36:05 -04:00
Fernando Sahmkow
084ceb925a UI: Replasce accurate GPU option for GPU Accuracy Level 2020-04-22 11:36:04 -04:00
Morph
91f1ffd283 Add a trailing separator to the string path 
Fixes #3643
 2020-04-22 07:33:14 -04:00
H27CK
c883cd103e Init SDL info structure and add dummy context 2020-04-22 07:47:21 +02:00
bunnei
e84f82a028
Merge pull request #3699 from FearlessTobi/port-5185 
Port citra-emu/citra#5185: "gdbstub: Fix some gdbstub jankiness"
 2020-04-21 22:26:10 -04:00
ReinUsesLisp
6f47bd9641 vk_memory_manager: Remove unified memory model flag 
All drivers (even Intel) seem to have a device local memory type that is
not host visible. Remove this flag so all devices follow the same path.

This fixes a crash when trying to map to host device local memory on
integrated devices.
 2020-04-21 22:06:38 -03:00
bunnei
d64290884a
Merge pull request #3714 from lioncash/copies 
gl_shader_decompiler: Avoid copies where applicable
 2020-04-21 20:16:02 -04:00
bunnei
cd47ccec49
Merge pull request #3745 from bunnei/fix-homebrew-load 
Fix process memory initialization for ELF and NRO
 2020-04-21 18:59:16 -04:00
ReinUsesLisp
488ed8bd02 vk_rasterizer: Add lazy default buffer maker and use it for empty buffers 
Introduce a default buffer getter that lazily constructs an empty
buffer. This is intended to match OpenGL's buffer 0.

Use this for disabled vertex and uniform buffers.

While we are at it, include vertex buffer usages for staging buffers to
silence validation errors.
 2020-04-21 19:55:52 -03:00
ReinUsesLisp
0bbae63300 gl_rasterizer: Fix buffers without size 
On NVN buffers can be enabled but have no size. According to deko3d and
the behavior we see in Animal Crossing: New Horizons these buffers get
the special address of 0x1000 and limit themselves to 0xfff.

Implement buffers without a size by binding a null buffer to OpenGL
without a side.

1d1930beea/source/maxwell/gpu_3d_vbo.cpp (L62-L63)
 2020-04-21 19:55:44 -03:00
Rodrigo Locatti
f293b15611
Merge pull request #3718 from ReinUsesLisp/better-pipeline-state 
fixed_pipeline_state: Pack structure, use memcmp and CityHash on it
 2020-04-21 18:17:58 -03:00
bunnei
9bf3abcb63
Merge pull request #3698 from lioncash/warning 
General: Resolve minor assorted warnings
 2020-04-21 14:11:18 -04:00
bunnei
48b670d132
Merge pull request #3724 from bunnei/fix-unicorn 
core: arm_unicorn: Fix interpret fallback by temporarily mapping instruction page.
 2020-04-20 23:28:23 -04:00
David
11c63ca969
audio_renderer: Preliminary BehaviorInfo (#3736) 
* audio_renderer: Preliminary BehaviorInfo

* clang format

* Fixed IsRevisionSupported

* fixed IsValidRevision

* Fixed logic error & spelling errors & crash

* Addressed issues
 2020-04-20 22:57:30 -04:00
bunnei
d3e0cefa60
Merge pull request #3695 from ReinUsesLisp/default-attributes 
maxwell_3d: Initialize format attributes constant as one
 2020-04-20 21:40:18 -04:00
ReinUsesLisp
8734ccb0cb shader/arithmetic_integer: Fix LEA_IMM encoding 
The operand order in LEA_IMM was flipped compared to nvdisasm. Fix that
using nxas as reference:

8dbc389957/table.h (L122)
 2020-04-20 21:54:59 -03:00
Mat M
cb5b8ca886
Merge pull request #3733 from ambasta/patch-2 
Initialize quad_indexed_pass before uint8_pass
 2020-04-20 20:36:46 -04:00
bunnei
9c12aef2f8 loader: nro: Fix process initialization using ProgramMetadata default. 2020-04-20 18:19:45 -04:00
bunnei
68039addbc loader: elf: Fix process initialization using ProgramMetadata default. 2020-04-20 18:19:45 -04:00
bunnei
f0a7f05070 file_sys: program_metadata: Add a helper function for generating reasonable default metadata. 
- We need this for homebrew process initialization.
 2020-04-20 18:19:45 -04:00
Lioncash
99eaa2e6f2 service: Update function tables 
Keeps the service function tables up to date.

Updated based off information on SwitchBrew.
 2020-04-20 15:53:49 -04:00
Mat M
200f69d2ff
Merge pull request #3739 from MerryMage/disable_cpu_opt 
dynarmic: Add option to disable CPU JIT optimizations
 2020-04-20 14:19:18 -04:00
FearlessTobi
4e99a06c70 npad: Lower log level for VibrateController to Debug 2020-04-20 18:44:57 +02:00
FearlessTobi
6ce0f3575a audren: Lower log level for RequestUpdateImpl to Debug 2020-04-20 18:44:41 +02:00
Fernando Sahmkow
ec2f8f4272
Merge pull request #3700 from ReinUsesLisp/stream-buffer-sizes 
vk_stream_buffer: Fix out of memory on boot on recent Nvidia drivers
 2020-04-20 09:37:42 -04:00
MerryMage
a3a12deecc dynarmic: Add option to disable CPU JIT optimizations 2020-04-20 13:36:26 +01:00
bunnei
6de36f0b61
Merge pull request #3712 from lioncash/remove 
service: Remove unused RequestParser instances
 2020-04-20 01:04:04 -04:00
bunnei
e3977243e2
Merge pull request #3709 from lioncash/am 
am: Resolve ineffective moves
 2020-04-20 00:15:00 -04:00
FearlessTobi
e7664b7a4f yuzu: Option to hide mouse on inactivity 
Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
 2020-04-20 04:21:58 +02:00
Amit Prakash Ambasta
5324b1d01e
Initialize quad_indexed_pass before uint8_pass 
Fixes Werror=reorder in gcc
 2020-04-20 04:53:52 +05:30
Rodrigo Locatti
4932010c6f
Merge pull request #3729 from lioncash/globals 
dma_pusher: Remove reliance on the global system instance
 2020-04-19 19:12:40 -03:00
bunnei
85c17a2c35
Merge pull request #3694 from ReinUsesLisp/indexed-quads 
vk_compute_pass: Implement indexed quads
 2020-04-19 16:52:40 -04:00
Lioncash
bfee33cce3 service/time: Remove reliance on the global system accessor 
Eliminates usages of the global system accessor and instead passes the
existing system instance into the interfaces.
 2020-04-19 16:31:28 -04:00
Lioncash
44e959157b dma_pusher: Remove reliance on the global system instance 
With this, the video core is now has no calls to the global system
instance at all.
 2020-04-19 16:12:08 -04:00
bunnei
2ea7a70da0
Merge pull request #3686 from lioncash/table 
texture_cache/format_lookup_table: Fix incorrect green, blue, and alpha indices
 2020-04-19 15:33:33 -04:00
bunnei
10fb26f69c
Merge pull request #3696 from lioncash/cast-size 
hle_ipc: Remove std::size_t casts where applicable
 2020-04-19 14:24:15 -04:00
MerryMage
2bfac7b61d thread: FPCR.FZ is likely not 1 2020-04-19 08:37:20 +01:00
bunnei
779a3b222a
Merge pull request #3655 from FearlessTobi/ui-retext-yuzu 
yuzu/main: Add better popup texts and remove duplicated actions
 2020-04-19 02:16:50 -04:00
bunnei
73db83c0ab
Merge pull request #3679 from lioncash/track 
track: Eliminate redundant copies
 2020-04-19 01:22:47 -04:00
bunnei
74c27fd1b5 core: arm_unicorn: Fix interpret fallback by temporarily mapping instruction page. 2020-04-19 00:53:23 -04:00
Jan Beich
afcc84a172 renderer_vulkan: assume X11 if not Windows/macOS after bf1d66b7c0 
Render.Vulkan <Error> video_core/renderer_vulkan/renderer_vulkan.cpp:CreateInstance:131: Presentation not supported on this platform
Render.Vulkan <Error> video_core/renderer_vulkan/renderer_vulkan.cpp:CreateSurface:378: Presentation not supported on this platform
Core <Critical> core/core.cpp:Load:199: Failed to initialize system (Error 5)!
 2020-04-19 00:32:23 +00:00
ReinUsesLisp
c81bf06d03 vulkan/wrapper: Sort physical devices 
Sort discrete GPUs over the rest, Nvidia over AMD, AMD over Intel, Intel
over the rest. This gives us a somewhat consistent order when Optimus
is removed (renderdoc does this when it's attached).

This can break the configuration of users with an Intel GPU that
manually remove Optimus on yuzu. That said, it's a very unlikely to
happen.
 2020-04-18 21:31:15 -03:00
ReinUsesLisp
d62f57cf5a fixed_pipeline_state: Hash and compare the whole structure 
Pad FixedPipelineState's size to 384 bytes to be a multiple of 16.

Compare the whole struct with std::memcmp and hash with CityHash. Using
CityHash instead of a naive hash should reduce the number of collisions.
Improve used type traits to ensure this operation is safe.

With these changes the improvements to the hashable pipeline state are:

Optimized structure
Hash:            89 ns
Comparison:     103 ns
Construction*:  164 ns
Struct size:    384 bytes

Original structure
Hash:           148 ns
Equal:          174 ns
Construction*:  281 ns
Size:          1384 bytes

* Attribute state initialization is not measured

These measures are averages taken with std::chrono::high_accuracy_clock
on MSVC shipped on Visual Studio 16.6.0 Preview 2.1.
 2020-04-18 19:57:26 -03:00
ReinUsesLisp
b571c92dfd fixed_pipeline_state: Pack blending state 
Reduce FixedPipelineState's size to 364 bytes.
 2020-04-18 19:23:35 -03:00
ReinUsesLisp
548dd27f45 fixed_pipeline_state: Pack rasterizer state 
Reduce FixedPipelineState's size to 600 bytes.
 2020-04-18 19:22:57 -03:00
ReinUsesLisp
7790144a55 fixed_pipeline_state: Pack depth stencil state 
Reduce FixedPipelineState's size to 632 bytes.
 2020-04-18 19:22:11 -03:00
ReinUsesLisp
ab6704f20c fixed_pipeline_state: Pack attribute state 
Reduce FixedPipelineState's size from 1384 to 664 bytes
 2020-04-18 19:21:19 -03:00
Mat M
5305806071
Merge pull request #3716 from bunnei/fix-another-impl-fallthrough 
video_core: gl_shader_decompiler: Fix implicit fallthrough errors.
 2020-04-18 15:17:52 -04:00
bunnei
03726fb7f5 video_core: gl_shader_decompiler: Fix implicit fallthrough errors. 2020-04-18 15:15:21 -04:00
bunnei
89e512ca8d
Merge pull request #3710 from lioncash/nso 
loader/nso: Resolve moves not occurring in DecompressSegment
 2020-04-18 14:44:42 -04:00
Mat M
45964e6fec
Merge pull request #3715 from bunnei/fix-impl-fallthrough 
service: hid: npad: Fix implicit fallthrough errors.
 2020-04-18 14:44:20 -04:00
bunnei
a8d5d08e2e service: hid: npad: Fix implicit fallthrough errors. 2020-04-18 14:41:08 -04:00
bunnei
907ba8794e
Merge pull request #3713 from lioncash/time 
service/time: Minor changes
 2020-04-17 21:04:43 -04:00
bunnei
90ddb13372
Merge pull request #3711 from lioncash/cast 
memory/slab_heap: Make use of static_cast over reinterpret_cast
 2020-04-17 21:04:11 -04:00
Lioncash
bf328ed35a gl_shader_decompiler: Avoid copies where applicable 
Avoids unnecessary reference count increments where applicable and also
avoids reallocating a vector.

Unlikely to make a huge difference, but given how trivial of an
amendment it is, why not?
 2020-04-17 20:48:52 -04:00
Lioncash
7714b02d95 time/system_clock_core: Remove unnecessary initializer 
This is already initialized within the class body.
 2020-04-17 20:04:06 -04:00
Lioncash
b533f18ab9 service/time: Mark IsStandardNetworkSystemClockAccuracySufficient as const 
This doesn't modify internal member state.
 2020-04-17 20:02:45 -04:00
Lioncash
0cfd3b94db service/time: Add virtual destructors where applicable 
Many of these implementations are used to implement a polymorphic
interface. While not directly used polymorphically, this prevents
virtual destruction from ever becoming an issue.
 2020-04-17 19:59:31 -04:00
Lioncash
4d8a8a8033 service: Remove unused RequestParser instances 
These aren't used, so they should be removed to reduce compilation
warnings.
 2020-04-17 19:47:43 -04:00
bunnei
7438d36d0e
Merge pull request #3630 from benru/open-windows-network-files 
common/file_util: Allow access to files on network shares
 2020-04-17 19:47:11 -04:00
Lioncash
7e585bce28 memory/slab_heap: Make use of static_cast over reinterpret_cast 
Casting from void* with static_cast is permitted by the standard, so we
can just make use of that instead.
 2020-04-17 19:38:59 -04:00
Lioncash
441a2812ed loader/nso: Resolve moves not occurring in DecompressSegment 
Given the std::vector was const, an automatic move out of the function
could not occur.

We can allow automatic return value optimizations to occur by making the
buffer non-const.
 2020-04-17 19:26:50 -04:00
Lioncash
64f226889c am: Resolve ineffective moves 
Previously const objects were being std::moved, which results in no move
actually occurring. This resolves that.
 2020-04-17 19:22:46 -04:00
Markus Wick
07fbef1776 video_code: Fix implicit switch fallthrough. 
Since yesterday, this breaks the build on linux.
So let's fix it.
 2020-04-17 23:43:35 +02:00
ReinUsesLisp
a7b6bd56d7 vk_stream_buffer: Fix out of memory on boot on recent Nvidia drivers 
Nvidia recently introduced a new memory type for data streaming
(awesome!), but yuzu was assuming that all heaps had enough memory
for the assumed stream buffer size (256 MiB).

This worked fine on AMD but Nvidia's new memory heap was smaller than
256 MiB. This commit changes this assumption and allocates a bit less
than the size of the preferred heap, with a maximum of 256 MiB (to avoid
allocating all system memory on integrated devices).

- Fixes a crash on NVIDIA 450.82.0.0
 2020-04-17 18:12:48 -03:00
Fernando Sahmkow
2133482a17
Merge pull request #3703 from yuzu-emu/revert-3656-glsl-full-decompile 
Revert "gl_shader_cache: Use CompileDepth::FullDecompile on GLSL"
 2020-04-17 17:08:41 -04:00
Fernando Sahmkow
775ecc7d05
Merge pull request #3672 from lioncash/null 
file_util: Early-exit in WriteArray and ReadArray if specified lengths are zero
 2020-04-17 17:02:35 -04:00
Rodrigo Locatti
990c0b184f
Revert "gl_shader_cache: Use CompileDepth::FullDecompile on GLSL" 2020-04-17 17:41:48 -03:00
bunnei
b8f5c71f2d
Merge pull request #3666 from bunnei/new-vmm 
Implement a new virtual memory manager
 2020-04-17 16:33:08 -04:00
bunnei
ca3af2961c
Merge pull request #3682 from lioncash/uam 
gl_query_cache: Resolve use-after-move in CachedQuery move assignment operator
 2020-04-17 01:24:08 -04:00
bunnei
8bbe74a8dc core: hle: Address various feedback & code cleanup. 
- Should be no functional changes.
 2020-04-17 00:59:36 -04:00
bunnei
92caa003a8 core: device_memory: Remove incorrect usage of constexpr. 2020-04-17 00:59:36 -04:00
bunnei
6f3266e98b memory: Add copyright notice for Atmosphere where applicable. 2020-04-17 00:59:35 -04:00
bunnei
02547a0cb4 kernel: Remove old VMManager class. 2020-04-17 00:59:35 -04:00
bunnei
bebfb05c1b loader: nso: Fix loader size and arguments. 2020-04-17 00:59:35 -04:00
bunnei
83761d5316 loader: elf/kip/nro: Updates for new VMM. 2020-04-17 00:59:35 -04:00
bunnei
37b79ebe85 service: ldr: Updates for new VMM. 
- Includes removing some service impls. that are untested.
 2020-04-17 00:59:35 -04:00
bunnei
a8292f6cd9 kernel: memory: page_table: Simplify GetPhysicalAddr impl. 2020-04-17 00:59:35 -04:00
bunnei
c629e544a7 kernel: svc: Updates for new VMM. 
- Includes removing some SVC impls. that are untested.
 2020-04-17 00:59:34 -04:00
bunnei
ff5d5b6f41 core: memory: Fix memory access on page boundaries. 
- Fixes Super Smash Bros. Ultimate.
 2020-04-17 00:59:34 -04:00
bunnei
32fc2aae3c video_core: memory_manager: Updates for Common::PageTable changes. 2020-04-17 00:59:34 -04:00
bunnei
f7c03610e1 core: memory: Updates for new VMM. 2020-04-17 00:59:34 -04:00
bunnei
4c1812ae37 common: page_table: Update to use VirtualBuffer and simplify. 2020-04-17 00:59:34 -04:00
bunnei
1d5923e150 core: gdbstub: Updates for new VMM. 2020-04-17 00:59:34 -04:00
bunnei
c7bc7986bb core: reporter: Updates for new VMM. 2020-04-17 00:59:33 -04:00
bunnei
18c4bb6f5c memory: cheat_engine: Updates for new VMM. 2020-04-17 00:59:33 -04:00
bunnei
d95ceaa8ec arm_test_common: Updates for new VMM. 2020-04-17 00:59:33 -04:00
bunnei
108564df57 kernel: process: Updates for new VMM. 2020-04-17 00:59:33 -04:00
bunnei
77382ac2b2 service: pl_u: Update for new shared memory layout. 2020-04-17 00:59:33 -04:00