early-access version 4018

This commit is contained in:
pineappleEA 2023-12-13 18:04:01 +01:00
parent 76fa9cc8e2
commit 81955276bf
9 changed files with 55 additions and 24 deletions

View File

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 4017. This is the source code for early-access 4018.
## Legal Notice ## Legal Notice

View File

@ -253,8 +253,9 @@ CubebSink::~CubebSink() {
#endif #endif
} }
SinkStream* CubebSink::AcquireSinkStream(Core::System& system, u32 system_channels, SinkStream* CubebSink::AcquireSinkStream(Core::System& system, u32 system_channels_,
const std::string& name, StreamType type) { const std::string& name, StreamType type) {
system_channels = system_channels_;
SinkStreamPtr& stream = sink_streams.emplace_back(std::make_unique<CubebSinkStream>( SinkStreamPtr& stream = sink_streams.emplace_back(std::make_unique<CubebSinkStream>(
ctx, device_channels, system_channels, output_device, input_device, name, type, system)); ctx, device_channels, system_channels, output_device, input_device, name, type, system));

View File

@ -168,8 +168,9 @@ SDLSink::SDLSink(std::string_view target_device_name) {
SDLSink::~SDLSink() = default; SDLSink::~SDLSink() = default;
SinkStream* SDLSink::AcquireSinkStream(Core::System& system, u32 system_channels, SinkStream* SDLSink::AcquireSinkStream(Core::System& system, u32 system_channels_,
const std::string&, StreamType type) { const std::string&, StreamType type) {
system_channels = system_channels_;
SinkStreamPtr& stream = sink_streams.emplace_back(std::make_unique<SDLSinkStream>( SinkStreamPtr& stream = sink_streams.emplace_back(std::make_unique<SDLSinkStream>(
device_channels, system_channels, output_device, input_device, type, system)); device_channels, system_channels, output_device, input_device, type, system));
return stream.get(); return stream.get();

View File

@ -85,9 +85,21 @@ public:
*/ */
virtual void SetSystemVolume(f32 volume) = 0; virtual void SetSystemVolume(f32 volume) = 0;
/**
* Get the number of channels the game has set, can be different to the host hardware's support.
* Either 2 or 6.
*
* @return Number of device channels.
*/
u32 GetSystemChannels() const {
return system_channels;
}
protected: protected:
/// Number of device channels supported by the hardware /// Number of device channels supported by the hardware
u32 device_channels{2}; u32 device_channels{2};
/// Number of channels the game is sending
u32 system_channels{2};
}; };
using SinkPtr = std::unique_ptr<Sink>; using SinkPtr = std::unique_ptr<Sink>;

View File

@ -40,29 +40,38 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
if (system_channels == 6 && device_channels == 2) { if (system_channels == 6 && device_channels == 2) {
// We're given 6 channels, but our device only outputs 2, so downmix. // We're given 6 channels, but our device only outputs 2, so downmix.
static constexpr std::array<f32, 4> down_mix_coeff{1.0f, 0.707f, 0.251f, 0.707f}; // Front = 1.0
// Center = 0.596
// Back = 0.707
// LFE = 0.354
// 1.0 + 0.596 + 0.707 + 0.354 = 2.657, 1/2.657 = 0.37636f downscale coefficient
static constexpr std::array<f32, 4> down_mix_coeff{0.37636f, 0.22431056f, 0.13323144f,
0.26608652f};
for (u32 read_index = 0, write_index = 0; read_index < samples.size(); for (u32 read_index = 0, write_index = 0; read_index < samples.size();
read_index += system_channels, write_index += device_channels) { read_index += system_channels, write_index += device_channels) {
const auto fl =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::FrontLeft)]);
const auto fr =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::FrontRight)]);
const auto c =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::Center)]);
const auto lfe =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::LFE)]);
const auto bl =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::BackLeft)]);
const auto br =
static_cast<f32>(samples[read_index + static_cast<u32>(Channels::BackRight)]);
const auto left_sample{ const auto left_sample{
((Common::FixedPoint<49, 15>( static_cast<s32>((fl * down_mix_coeff[0] + c * down_mix_coeff[1] +
samples[read_index + static_cast<u32>(Channels::FrontLeft)]) * lfe * down_mix_coeff[2] + bl * down_mix_coeff[3]) *
down_mix_coeff[0] + volume)};
samples[read_index + static_cast<u32>(Channels::Center)] * down_mix_coeff[1] +
samples[read_index + static_cast<u32>(Channels::LFE)] * down_mix_coeff[2] +
samples[read_index + static_cast<u32>(Channels::BackLeft)] * down_mix_coeff[3]) *
volume)
.to_int()};
const auto right_sample{ const auto right_sample{
((Common::FixedPoint<49, 15>( static_cast<s32>((fr * down_mix_coeff[0] + c * down_mix_coeff[1] +
samples[read_index + static_cast<u32>(Channels::FrontRight)]) * lfe * down_mix_coeff[2] + br * down_mix_coeff[3]) *
down_mix_coeff[0] + volume)};
samples[read_index + static_cast<u32>(Channels::Center)] * down_mix_coeff[1] +
samples[read_index + static_cast<u32>(Channels::LFE)] * down_mix_coeff[2] +
samples[read_index + static_cast<u32>(Channels::BackRight)] * down_mix_coeff[3]) *
volume)
.to_int()};
samples[write_index + static_cast<u32>(Channels::FrontLeft)] = samples[write_index + static_cast<u32>(Channels::FrontLeft)] =
static_cast<s16>(std::clamp(left_sample, min, max)); static_cast<s16>(std::clamp(left_sample, min, max));

View File

@ -359,7 +359,7 @@ private:
void GetActiveChannelCount(HLERequestContext& ctx) { void GetActiveChannelCount(HLERequestContext& ctx) {
const auto& sink{system.AudioCore().GetOutputSink()}; const auto& sink{system.AudioCore().GetOutputSink()};
u32 channel_count{sink.GetDeviceChannels()}; u32 channel_count{sink.GetSystemChannels()};
LOG_DEBUG(Service_Audio, "(STUBBED) called. Channels={}", channel_count); LOG_DEBUG(Service_Audio, "(STUBBED) called. Channels={}", channel_count);

View File

@ -165,6 +165,12 @@ void PresentManager::Present(Frame* frame) {
return; return;
} }
{
// If we have run too far ahead of command processing, wait.
std::unique_lock lock{queue_mutex};
frame_cv.wait(lock, [&] { return present_queue.size() < FRAMES_IN_FLIGHT - 1; });
}
scheduler.Record([this, frame](vk::CommandBuffer) { scheduler.Record([this, frame](vk::CommandBuffer) {
std::unique_lock lock{queue_mutex}; std::unique_lock lock{queue_mutex};
present_queue.push(frame); present_queue.push(frame);

View File

@ -22,6 +22,10 @@ class Device;
class Scheduler; class Scheduler;
class Swapchain; class Swapchain;
// This should be plenty for the vast majority of cases. Most desktop platforms only
// provide up to 3 swapchain images.
constexpr size_t FRAMES_IN_FLIGHT = 7;
struct Frame { struct Frame {
u32 width; u32 width;
u32 height; u32 height;

View File

@ -5,6 +5,7 @@
#include <array> #include <array>
#include "video_core/renderer_vulkan/vk_present_manager.h"
#include "video_core/vulkan_common/vulkan_wrapper.h" #include "video_core/vulkan_common/vulkan_wrapper.h"
namespace Vulkan { namespace Vulkan {
@ -29,9 +30,6 @@ struct DescriptorUpdateEntry {
}; };
class UpdateDescriptorQueue final { class UpdateDescriptorQueue final {
// This should be plenty for the vast majority of cases. Most desktop platforms only
// provide up to 3 swapchain images.
static constexpr size_t FRAMES_IN_FLIGHT = 7;
static constexpr size_t FRAME_PAYLOAD_SIZE = 0x20000; static constexpr size_t FRAME_PAYLOAD_SIZE = 0x20000;
static constexpr size_t PAYLOAD_SIZE = FRAME_PAYLOAD_SIZE * FRAMES_IN_FLIGHT; static constexpr size_t PAYLOAD_SIZE = FRAME_PAYLOAD_SIZE * FRAMES_IN_FLIGHT;