19c6bf72db
Merge pull request #4322 from ReinUsesLisp/fix-dynstate
...
vk_state_tracker: Fix dirty flags for stencil_enable on VK_EXT_extended_dynamic_state
2020-07-17 09:50:45 -04:00
723edb4c06
alignment: Simplify AlignmentAllocator implementation
...
With C++20, much of the allocator interface has been simplified, so we
can make the same adjustments.
2020-07-17 08:30:12 -04:00
47956a3bbc
Merge pull request #4369 from lioncash/hle-macro
...
macro_hle: Remove unnecessary std::make_pair calls
2020-07-17 05:20:41 -04:00
9d3cbf6a90
Merge pull request #4340 from lioncash/remove
...
shader_cache: Make use of std::erase_if
2020-07-17 05:19:20 -04:00
4f473cda64
Drop settings namespace
2020-07-17 17:23:24 +10:00
85b591f6f0
Remove duplicate config
2020-07-17 14:26:18 +10:00
f48187449e
Use conditional var
2020-07-17 14:26:17 +10:00
2ba195aa0d
Drop max workers from 8->2 for testing
2020-07-17 14:26:15 +10:00
85d7a8f466
Rebase for per game settings
2020-07-17 14:26:14 +10:00
468bd9c1b0
async shaders
2020-07-17 14:24:57 +10:00
c783cf443e
Merge pull request #4347 from lioncash/logging
...
settings: Make use of std::string_view over std::string for logging
2020-07-17 13:25:06 +10:00
92f37a229e
Merge pull request #4371 from lioncash/cmake2
...
core/CMakeLists: Add missing physical_memory.h header file
2020-07-17 13:22:19 +10:00
adbf5ca50b
Merge pull request #4357 from lioncash/unused4
...
kernel: Remove unused variables
2020-07-17 13:18:31 +10:00
69f8b6a53e
Merge pull request #4358 from lioncash/unused5
...
kernel/thread: Remove unimplemented function prototype
2020-07-17 13:17:52 +10:00
c0650cd82c
macro_hle: Remove unnecessary static keywords
...
These functions are already in an anonymous namespace which makes the
functions internally linked.
2020-07-16 23:17:17 -04:00
0d10c863a5
Merge pull request #4367 from lioncash/inc2
...
constants: Add missing <array> include
2020-07-17 13:14:01 +10:00
9cca0c2f83
Merge pull request #4368 from lioncash/macro
...
macro: Resolve missing parameter in doxygen comment
2020-07-17 13:13:22 +10:00
3ce4edba64
Merge pull request #4370 from lioncash/simplify
...
macro_hle: Simplify shift expression in HLE_771BB18C62444DA0()
2020-07-17 13:13:05 +10:00
311f500753
core/CMakeLists: Add missing physical_memory.h header file
...
Allows this header file to show up in IDE CMake generators.
2020-07-16 22:56:31 -04:00
be6b7591d9
macro_hle: Simplify shift expression in HLE_771BB18C62444DA0()
...
Given the expression involves a 32-bit value, this simplifies down to
just: 0x3ffffff. This is likely a remnant from testing that was never
cleaned up.
Resolves a -Wshift-overflow warning.
2020-07-16 22:16:11 -04:00
cc935d997b
macro_hle: Remove unnecessary std::make_pair calls
...
The purpose of make_pair is generally to deduce the types within the
pair without explicitly specifying the types, so these usages were
generally unnecessary, particularly when the type is enforced by the
array declaration.
2020-07-16 21:59:25 -04:00
502dbfb9eb
macro: Resolve missing parameter in doxygen comment
...
Resolves a -Wdocumentation warning.
2020-07-16 21:54:42 -04:00
e07eb5b223
constants: Add missing <array> include
...
Eliminates reliance on an indirect include.
2020-07-16 21:43:20 -04:00
e54c940abf
mii/manager: Resolve sign mismatch warnings
...
Previously the loop termination condition was testing variables of
different signedness.
2020-07-16 21:07:04 -04:00
39ae2deb28
Merge pull request #4363 from lioncash/mismatch
...
vk_texture_cache: Amend mismatched access masks and indices in UploadBuffer
2020-07-16 21:54:40 -03:00
7f989378c0
mii/manager: Make use of designated initializers
...
Allows returning the structure in a more concise manner.
2020-07-16 20:45:33 -04:00
3bbf4462db
Merge pull request #4292 from bunnei/mii-rewrite
...
hle: service: mii: Rewrite service to properly support creation of random and default miis.
2020-07-16 20:05:40 -04:00
7785123b1c
wrapper: Make use of designated initializers where applicable
2020-07-16 20:01:01 -04:00
01da386617
vk_texture_cache: Make use of designated initializers where applicable
2020-07-16 19:52:38 -04:00
169759e069
vk_texture_cache: Amend mismatched access masks and indices in UploadBuffer
...
Discovered while converting relevant parts of the codebase over to
designated initializers.
2020-07-16 19:45:46 -04:00
08d36afd40
vk_swapchain: Make use of designated initializers where applicable
2020-07-16 19:27:02 -04:00
3c060503bc
vk_stream_buffer: Make use of designated initializers where applicable
2020-07-16 19:22:11 -04:00
70147e913f
vk_staging_buffer_pool: Make use of designated initializers where applicable
2020-07-16 19:22:03 -04:00
2025f847bb
vk_shader_util: Make use of designated initializers where applicable
2020-07-16 19:17:41 -04:00
97e7663004
vk_scheduler: Make use of designated initializers where applicable
2020-07-16 19:11:43 -04:00
fd7af52ec3
vk_sampler_cache: Make use of designated initializers where applicable
2020-07-16 19:06:40 -04:00
772b6e4d28
vk_resource_manager: Make use of designated initializers where applicable
2020-07-16 19:02:35 -04:00
8ebd6a21c5
vk_renderpass_cache: Make use of designated initializers where applicable
2020-07-16 18:57:23 -04:00
01f297f2e0
vk_rasterizer: Make use of designated initializers where applicable
2020-07-16 18:49:42 -04:00
c07b0ffe47
vk_query_cache: Make use of designated initializers where applicable
2020-07-16 18:34:04 -04:00
d43e923990
vk_pipeline_cache: Make use of designated initializers where applicable
2020-07-16 18:32:29 -04:00
7d5f93832c
vk_memory_manager: Make use of designated initializers where applicable
2020-07-16 18:26:30 -04:00
75c00c3cb0
vk_image: Make use of designated initializers where applicable
2020-07-16 18:24:26 -04:00
6d165481ad
vk_descriptor_pool: Make use of designated initializers where applicable
2020-07-16 18:19:45 -04:00
fb563e75e9
vk_graphics_pipeline: Resolve narrowing warnings
...
For whatever reason, VK_TRUE and VK_FALSE aren't defined as having a
VkBool32 type, so we need to cast to it explicitly.
2020-07-16 18:13:49 -04:00
5330ca396d
vk_compute_pipeline: Make use of designated initializers where applicable
2020-07-16 17:32:12 -04:00
757ddd8158
vk_compute_pass: Make use of designated initializers where applicable
...
Note: Some barriers can't be converted over yet, as they ICE MSVC.
2020-07-16 17:23:56 -04:00
a66a0a6a53
vk_buffer_cache: Make use of designated initializers where applicable
...
Note: An array within CopyFrom() cannot be converted over yet, as it
ICEs MSVC when converted over.
2020-07-16 16:59:39 -04:00
104c523d3d
Merge pull request #4327 from lioncash/desig2
...
address_space_info: Make use of designated initializers
2020-07-16 17:41:55 -03:00
be68ee88c2
Merge pull request #4333 from lioncash/desig3
...
vk_graphics_pipeline: Make use of designated initializers where applicable
2020-07-16 17:41:45 -03:00
b6d73ec9c2
Merge pull request #4332 from lioncash/vkdev
...
vk_device: Make use of designated initializers where applicable
2020-07-16 17:41:20 -03:00
210cc0204d
decode/other: Implement S2R.LaneId
...
This maps to host's thread id.
- Fixes graphical issues on Paper Mario.
2020-07-16 16:09:39 -03:00
88e57b13e0
gl_arb_decompiler: Execute BAR even when inside control flow
...
Unlike GLSL, GLASM allows us to call BAR inside control flow.
- Fixes graphical artifacts in Paper Mario.
2020-07-16 16:05:52 -03:00
a5a72cbd20
renderer_{opengl,vulkan}: Clamp shared memory to host's limit
...
This stops shaders from failing to build when the exceed host's shared
memory size limit. An error is logged.
2020-07-16 16:02:46 -03:00
98b36625fa
Merge pull request #4321 from lioncash/desig
...
vk_blit_screen: Make use of designated initializers where applicable
2020-07-16 14:55:36 -04:00
8bef49cde5
kernel/thread: Remove unimplemented function prototype
...
This isn't used, so it can be removed.
2020-07-16 14:32:46 -04:00
2bab07c367
kernel: Remove unused variables
...
Resolves some compiler warnings in the Linux build.
2020-07-16 14:17:50 -04:00
07d080ecc8
kernel: Add missing include
2020-07-16 13:51:51 -04:00
f0125b2be8
cpu_manager: Mark function getters as static
...
All these do are return std::function instances of static functions, so
these can be used without an instance of the CPU manager.
2020-07-16 13:30:56 -04:00
51546ce57e
cpu_manager: Remove unused preemption_count variable
...
Shrinks the data structure by 8 bytes.
2020-07-16 13:24:25 -04:00
201514cb50
cpu_manager: Add missing includes
...
Previously this header was relying on indirect inclusions that are no
longer satisfied.
2020-07-16 13:22:58 -04:00
94f5f29573
Refactor adapter code
2020-07-16 13:00:04 -04:00
a89dfc9183
Merge pull request #4261 from ameerj/gc-calibration
...
input_common: GC Controller save and compare against analog origin state
2020-07-16 11:40:09 -04:00
2781201bfb
Merge pull request #4337 from lat9nq/fix-per-game-async
...
main: Set async gpu properly after loading per-game setting
2020-07-16 11:33:51 -04:00
9121d35e70
Merge pull request #4297 from FearlessTobi/skip-profile-select
...
main/profile_select: Don't prompt for profile selection when only one is available
2020-07-16 09:45:09 -04:00
0648e023ea
Merge pull request #4346 from lioncash/thread
...
kernel/handle_table: Remove usages of the global system instance
2020-07-16 23:02:04 +10:00
0319cc1c37
hid: Only update keyboard & debug pad inputs if enabled
...
Previously we would ignore this setting and would update the states regardless of the user setting
2020-07-16 22:28:49 +10:00
815f30dc10
Merge pull request #4249 from Morph1984/delete-update-aoc-on-overwrite
...
registered_cache: Remove previous update/dlc if it exists on install
2020-07-16 20:36:22 +10:00
f66e3181dc
Check for empty section0 and CNMT prior to install
2020-07-16 05:22:51 -04:00
5892fc1555
Add comment to clarify the nullptr check
2020-07-16 00:15:27 -04:00
2079bb4090
filesystem: Create subdirectories prior to creating a file
...
If subdirectories exist in the given path parameter and don't exist in the real filesystem create them prior to creating the files within.
This fixes the softlocks upon save creation in The Legend of Zelda: Breath of the Wild
2020-07-16 00:15:27 -04:00
f26f53f35b
Merge pull request #4328 from lioncash/unused-var3
...
memory_layout: Remove unused data member
2020-07-15 22:08:05 -04:00
0435b7d361
core_timing: Remove unused data member
...
Shrinks the size of the CoreTiming class by 8 bytes.
2020-07-15 19:41:37 -04:00
bef1844a51
core_timing: Make TimedCallback take std::chrono::nanoseconds
...
Enforces our desired time units directly with a concrete type.
2020-07-15 19:41:22 -04:00
8b50c660df
core_timing: Make use of std::chrono with ScheduleEvent
2020-07-15 18:54:15 -04:00
af5a56ddc4
settings: Resolve a sign conversion warning within GetTimeZoneString()
...
A sign conversion warning was occurring due to an int < size_t
comparison.
2020-07-15 13:45:22 -04:00
73bb87c06b
kernel/process: Move name and system context to the bottom of the member list
...
These aren't directly important or commonly used within the process, so
we can move these to the bottom to allow everything else to be more
likely to be within a cache line.
2020-07-15 13:40:18 -04:00
52e83f0d5c
kernel/handle_table: Remove usages of the global system instance
...
Removes even more usages of the global system instance, trimming away
more dependencies on global variables and making them explicit in the
interface.
2020-07-15 13:40:15 -04:00
5dbf91d739
settings: Make use of std::string_view over std::string for logging
...
In all usages of LogSetting(), string literals are provided.
std::string_view is better suited here, as we won't churn a bunch of
string allocations every time the settings are logged out.
While we're at it, we can fold LogSetting() into LogSettings(), given
it's only ever used there.
2020-07-15 13:37:33 -04:00
4ad69ca96e
kernel/thread: Remove global GetCurrentThread()
...
This is only used in one place, so we can fold it into the calling code,
eliminating a place for the global system instance to be used.
2020-07-15 13:28:05 -04:00
0ca7b8269a
clang format
2020-07-15 13:27:04 -04:00
1bbc61f5f1
Use proper install result when overwriting files
2020-07-15 13:27:04 -04:00
8794e623d9
Remove global system instance and address feedback
2020-07-15 13:27:04 -04:00
a82fdea1ac
registered_cache: Remove previous update/dlc if it exists on install
...
- This checks for and removes old updates or dlc based on title id. If a content meta nca exists within the registered cache, it will attempt to remove all the ncas associated with the content meta before installing a new update/dlc
2020-07-15 13:27:04 -04:00
e90802e762
clang-format
2020-07-15 01:22:52 +02:00
b608acd688
dmnt_cheat_vm: Implement opcode 0xC3 (ReadWriteStaticRegister)
...
This was based on Atmosphére's DMNT Cheat VM:
- https://github.com/Atmosphere-NX/Atmosphere/blob/master/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.hpp
- https://github.com/Atmosphere-NX/Atmosphere/blob/master/stratosphere/dmnt/source/cheat/impl/dmnt_cheat_vm.cpp
From Atmosphére's documentation: "Code type 0xC3 reads or writes a static register with a given register"
There are now only two remaining opcodes to implement (PauseProcess and BreakProcess)
This is untested because I don't have any experience in testing cheats on yuzu
2020-07-15 01:19:22 +02:00
263200f982
Merge pull request #4342 from lioncash/endian
...
common/swap: Make use of std::endian
2020-07-14 18:49:07 -03:00
9f027b1af2
common/swap: Make use of std::endian
...
Allows removing a bunch of defines in favor of a two liner.
2020-07-14 16:26:54 -04:00
969100d41a
shader_cache: Make use of std::erase_if
...
Now that we use C++20, we can also make use of std::erase_if instead of
needing to do the erase-remove idiom.
2020-07-14 15:49:15 -04:00
666b37ad56
Merge pull request #4242 from ReinUsesLisp/maxwell-dma
...
maxwell_dma: Match official doc and support pitch->voxel copies
2020-07-14 14:04:16 -04:00
a683e42516
clang-format
2020-07-14 13:46:42 -04:00
6d1477f214
settings: Move settings sanitization to its own function
...
Creates a new function that can be expanded later to fix other settings that are known to cause emulation errors across executables.
2020-07-14 13:36:09 -04:00
93fe982a0c
Rebase to master
2020-07-14 13:04:02 -04:00
e2730372b8
Merge pull request #4294 from MerryMage/cpu-opt-settings
...
configuration: Add settings to enable/disable specific CPU optimizations
2020-07-14 12:38:03 -04:00
450cbcfee6
Merge pull request #4282 from Morph1984/fs-size
...
filesystem: Set various NAND partition sizes to their defaults
2020-07-14 12:16:42 -04:00
ab65de2f96
Fix crash if gc configured but adapter not connected
2020-07-14 11:23:10 -04:00
393cdb15f5
Merge pull request #4314 from lioncash/input-warn
...
gcadapter: Tidy up compiler warnings
2020-07-14 10:20:12 -04:00
edb291b3be
Merge pull request #4315 from lioncash/udp-warn
...
udp: Silence a C++20 deprecation warning
2020-07-14 09:33:16 -04:00
8160e142e1
main: Set async gpu properly after loading per-game setting
...
Another error that got pass me and only noticed when I was doing the per-game settings UI rework. This prevents asynchronous GPU emulation from being disabled while multi core is enabled as a result of a poorly put together per-game config.
2020-07-14 01:02:10 -04:00
e02687ff47
configure_general: Explicitly guard use_multi_core when applying settings
...
This is likely an oversight during a rebase. Guards use_multi_core to be only set when the global value is in use. It should not make a difference given the current code base, but makes the code sensible.
2020-07-14 00:49:17 -04:00
0f8b977663
vk_device: Make use of designated initializers where applicable
...
Avoids redundant repetitions of variable names, and allows assignment
all in one statement.
2020-07-13 22:24:01 -04:00
edb2caaae5
Merge pull request #4280 from jbeich/system-libusb
...
cmake: pass libusb include directory
2020-07-13 22:21:07 -04:00
b284c43385
input_common: drop unused libusb.h include
...
Remnant of an early implementation.
2020-07-14 01:50:34 +00:00
0475a167f8
vk_graphics_pipeline: Make use of designated initializers where applicable
...
Avoids redundant variable name repetitions.
2020-07-13 21:07:56 -04:00
883fab2fff
input_common: make libusb private to gc_adapter
2020-07-13 18:48:19 +00:00
f2f876e3ff
memory_layout: Remove unused data member
...
This isn't used, so it can be removed entirely, shrinking the structure
size by 8 bytes.
2020-07-13 10:51:23 -04:00
ed0fe04b4f
address_space_info: Use type alias to simplify code
...
We can define an alias for the index arrays and then just reuse it to
make the code nicer to read.
2020-07-13 10:42:52 -04:00
c3eb42de65
address_space_info: Make use of designated initializers
...
We can alter the structure so that we can use designated initializers in
the array, eliminating the comments that indicate their field names.
2020-07-13 10:42:49 -04:00
fbc232426d
video_core: Rearrange pixel format names
...
Normalizes pixel format names to match Vulkan names. Previous to this
commit pixel formats had no convention, leading to confusion and
potential bugs.
2020-07-13 01:44:23 -03:00
eda37ff26b
video_core: Fix DXT4 and RGB565
2020-07-13 01:01:09 -03:00
a8dab2ffb3
video_core/format_lookup_table: Add formats with existing PixelFormat
2020-07-13 01:01:09 -03:00
480850ffe7
video_core: Fix B5G6R5_UNORM render target format
2020-07-13 01:01:09 -03:00
990b14f181
video_core: Fix B5G6R5U
2020-07-13 01:01:09 -03:00
1d20aac795
video_core: Implement RGBA32_SINT render target
2020-07-13 01:01:09 -03:00
9338599d72
video_core: Implement RGBA32_SINT render target
2020-07-13 01:01:09 -03:00
95c0f5afe5
video_core: Implement RGBA16_SINT render target
2020-07-13 01:01:09 -03:00
977d6c46f3
video_core: Implement RGBA8_SINT render target
2020-07-13 01:01:09 -03:00
50c6030a8d
video_core: Implement RG32_SINT render target
2020-07-13 01:01:09 -03:00
e849d68048
video_core: Implement RG8_SINT render target and fix RG8_UINT
2020-07-13 01:01:09 -03:00
f29fede49c
video_core: Implement R8_SINT render target
2020-07-13 01:01:08 -03:00
fd33e996e0
video_core: Implement R8_SNORM render target
2020-07-13 01:01:08 -03:00
505c206eb8
video_core/surface: Remove explicit values on PixelFormat's definition
2020-07-13 01:01:08 -03:00
143662118c
video_core/surface: Reorder render target to pixel format switch
2020-07-13 01:01:08 -03:00
db6fbd5894
vk_blit_screen: Make use of designated initializers where applicable
...
Now that we make use of C++20, we can use designated initializers to
make things a little nicer to read.
2020-07-12 19:45:30 -04:00
0fe09df386
vk_state_tracker: Fix dirty flags for stencil_enable on VK_EXT_extended_dynamic_state
...
Fixes a regression on any game using stencil on devices with
VK_EXT_extended_dynamic_state.
2020-07-12 20:43:42 -03:00
8df93132cd
udp: Silence a C++20 deprecation warning
...
C++20 deprecates using the = lambda capture to implicitly capture the
this pointer. Instead, we must specify it explicitly.
2020-07-12 15:49:42 -04:00
a1dddca4ab
gc_poller: Mark GCButtonFactory::GetNextInput() as const
...
This doesn't modify class instance state.
2020-07-12 15:43:07 -04:00
839c91cd14
gc_poller: Get rid of undefined behavior in Create()
...
Ensures that the function always has returns in all control paths.
2020-07-12 15:41:35 -04:00
a8ba6dc3c9
gc_poller: Silence sign conversion warnings
2020-07-12 15:40:22 -04:00
32b6fc4062
gc_adapter: Remove deprecated usage of = in lambda captures
...
It's deprecated in C++20 to use = to capture the this pointer.
Instead, we can simply pass this as an argument to the thread
constructor.
2020-07-12 15:38:19 -04:00
9ce6ea648f
gc_adapter: Silence sign conversion warnings
2020-07-12 15:36:27 -04:00
a67d00ef31
configure_cpu: Split optimization settings off into Debug tab
2020-07-12 19:32:32 +01:00
739d90ee66
Merge pull request #4265 from Morph1984/file-rename
...
vfs_real: Fix MoveFile
2020-07-12 13:00:09 -04:00
ed89bcc767
Merge pull request #4290 from lioncash/latest
...
CMakeLists: Make use of /std:c++latest on MSVC
2020-07-12 12:25:10 -04:00
f1aabc21ee
Merge pull request #3385 from Morph1984/batch-install
...
frontend: Add support to batch install files to NAND
2020-07-12 12:20:56 -04:00
80a0f2a118
common/alignment: Fix compilation errors ( #4303 )
2020-07-12 16:45:49 +02:00
fd1c3aa14e
fs: Fix RomFS building when zero byte files are present
...
When zero byte files are present, the key (offset) for that file is identical to the file right after. A std::map isn't able to fit key-value pairs with identical keys (offsets), therefore, the solution is to use std::multimap which permits multiple entries with the same key.
This most prominently fixes Pokemon Sword and Shield weather with any RomFS mod applied.
2020-07-12 04:33:35 -04:00
e60733aad3
Merge pull request #4275 from CrazyMax/desired_language
...
AM: fix GetDesiredLanguage:
2020-07-12 01:45:08 -04:00
5fb27f83cf
Merge pull request #4289 from ReinUsesLisp/dynfix
...
vk_rasterizer: Pass <pSizes> to CmdBindVertexBuffers2EXT
2020-07-11 23:44:03 -04:00
e706501c8d
hle: service: mii: Rewrite service to properly support creation of random and default miis.
2020-07-11 21:34:59 -04:00
1074c87f18
Revert "Port citra-emu/citra#5441 : "Common: remove a mod from AlignUp""
2020-07-11 19:28:09 -04:00
a4306b9e56
Common: remove a mod from AlignUp ( #5441 )
...
In cases where the size is not a known constant when inlining, AlignUp<std::size_t> currently generates two 64-bit div instructions.
This generates one div and a cmov which is significantly cheaper.
2020-07-11 18:39:00 +02:00
da11a27f42
configure_cpu: Add tooltips
2020-07-11 16:38:38 +01:00
505aa3a4c1
configure_cpu: Show/Hide debugging options
2020-07-11 16:38:38 +01:00
a59ad9246b
main/profile_select: Don't prompt for profile selection when only one is available
2020-07-11 16:08:34 +02:00
0193202964
configuration: Add settings to enable/disable specific CPU optimizations
2020-07-11 14:34:09 +01:00
fb0fefc75c
CMakeLists: Make use of /std:c++latest on MSVC
...
Provides the buildbot with one builder that is always tracking the
latest version of the C++ standard, allowing us to progressively rectify
our code and amend any differences between standards over time instead
of waiting for a complete standard change, potentially breaking a lot of
code all at once.
2020-07-11 04:45:40 -04:00
a0ee597b19
Merge pull request #4203 from VolcaEM/services
...
service: Update function tables
2020-07-11 00:02:36 -04:00
a45a57641f
Merge pull request #4250 from Morph1984/key-writing
...
KeyManager: Prevent writing of invalid keys
2020-07-10 22:45:18 -04:00
fca26980a2
vk_rasterizer: Pass <pSizes> to CmdBindVertexBuffers2EXT
...
This has been fixed in Nvidia's public beta driver 451.74. The previous
beta driver will be broken, people using these will have to update.
2020-07-10 18:15:32 -03:00
bunnei
Lioncash
David Marcec
David
Rodrigo Locatti
Ameer
Morph
VolcaEM
lat9nq
Jan Beich
MerryMage
Fernando Sahmkow
Tobias
Marshall Mohror