Compare commits
6 Commits
android-74
...
android-75
Author | SHA1 | Date | |
---|---|---|---|
f81af557d6 | |||
974380fe10 | |||
d6cf54dd2f | |||
5d7571114e | |||
e3dd78e414 | |||
b9ab44ed0e |
@ -1,3 +1,11 @@
|
||||
| Pull Request | Commit | Title | Author | Merged? |
|
||||
|----|----|----|----|----|
|
||||
|
||||
|
||||
End of merge log. You can find the original README.md below the break.
|
||||
|
||||
-----
|
||||
|
||||
<!--
|
||||
SPDX-FileCopyrightText: 2018 yuzu Emulator Project
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
@ -27,12 +27,12 @@ u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||
|
||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||
const AdpcmDataSourceVersion1Command& command) const {
|
||||
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
||||
}
|
||||
|
||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||
const AdpcmDataSourceVersion2Command& command) const {
|
||||
return static_cast<u32>(command.pitch * 0.25f * 1.2f);
|
||||
return static_cast<u32>(command.pitch * 0.46f * 1.2f);
|
||||
}
|
||||
|
||||
u32 CommandProcessingTimeEstimatorVersion1::Estimate(
|
||||
|
@ -684,11 +684,11 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
||||
sink_context, splitter_context, perf_manager};
|
||||
|
||||
voice_context.SortInfo();
|
||||
command_generator.GenerateVoiceCommands();
|
||||
|
||||
const auto start_estimated_time{drop_voice_param *
|
||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||
|
||||
command_generator.GenerateVoiceCommands();
|
||||
command_generator.GenerateSubMixCommands();
|
||||
command_generator.GenerateFinalMixCommands();
|
||||
command_generator.GenerateSinkCommands();
|
||||
@ -708,11 +708,13 @@ u64 System::GenerateCommand(std::span<u8> in_command_buffer,
|
||||
|
||||
const auto end_estimated_time{drop_voice_param *
|
||||
static_cast<f32>(command_buffer.estimated_process_time)};
|
||||
|
||||
const auto dsp_time_limit{((time_limit_percent / 100.0f) * 2'880'000.0f) *
|
||||
(static_cast<f32>(render_time_limit_percent) / 100.0f)};
|
||||
|
||||
const auto estimated_time{start_estimated_time - end_estimated_time};
|
||||
|
||||
const auto time_limit{static_cast<u32>(
|
||||
estimated_time + (((time_limit_percent / 100.0f) * 2'880'000.0) *
|
||||
(static_cast<f32>(render_time_limit_percent) / 100.0f)))};
|
||||
const auto time_limit{static_cast<u32>(std::max(dsp_time_limit + estimated_time, 0.0f))};
|
||||
num_voices_dropped =
|
||||
DropVoices(command_buffer, static_cast<u32>(start_estimated_time), time_limit);
|
||||
}
|
||||
|
@ -140,6 +140,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,
|
||||
return PixelFormat::D32_FLOAT;
|
||||
case Hash(TextureFormat::Z16, UNORM):
|
||||
return PixelFormat::D16_UNORM;
|
||||
case Hash(TextureFormat::Z16, UNORM, UINT, UINT, UINT, LINEAR):
|
||||
return PixelFormat::D16_UNORM;
|
||||
case Hash(TextureFormat::Z24S8, UINT, UNORM, UNORM, UNORM, LINEAR):
|
||||
return PixelFormat::S8_UINT_D24_UNORM;
|
||||
case Hash(TextureFormat::Z24S8, UINT, UNORM, UINT, UINT, LINEAR):
|
||||
|
Reference in New Issue
Block a user