early-access version 4134
This commit is contained in:
parent
9d83e9ad1b
commit
765c7bb93a
@ -1,7 +1,7 @@
|
||||
yuzu emulator early access
|
||||
=============
|
||||
|
||||
This is the source code for early-access 4132.
|
||||
This is the source code for early-access 4134.
|
||||
|
||||
## Legal Notice
|
||||
|
||||
|
@ -12,7 +12,7 @@ INewlyArrivedEventHolder::INewlyArrivedEventHolder(Core::System& system_)
|
||||
"INewlyArrivedEventHolder"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, C<&INewlyArrivedEventHolder::Get>, "Get"},
|
||||
{0, D<&INewlyArrivedEventHolder::Get>, "Get"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
|
@ -11,12 +11,12 @@ INewsDatabaseService::INewsDatabaseService(Core::System& system_)
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, nullptr, "GetListV1"},
|
||||
{1, C<&INewsDatabaseService::Count>, "Count"},
|
||||
{1, D<&INewsDatabaseService::Count>, "Count"},
|
||||
{2, nullptr, "CountWithKey"},
|
||||
{3, nullptr, "UpdateIntegerValue"},
|
||||
{4, nullptr, "UpdateIntegerValueWithAddition"},
|
||||
{4, D<&INewsDatabaseService::UpdateIntegerValueWithAddition>, "UpdateIntegerValueWithAddition"},
|
||||
{5, nullptr, "UpdateStringValue"},
|
||||
{1000, nullptr, "GetList"},
|
||||
{1000, D<&INewsDatabaseService::GetList>, "GetList"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@ -32,4 +32,22 @@ Result INewsDatabaseService::Count(Out<s32> out_count,
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result INewsDatabaseService::UpdateIntegerValueWithAddition(
|
||||
u32 value, InBuffer<BufferAttr_HipcPointer> buffer_data_1,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_2) {
|
||||
LOG_WARNING(Service_BCAT, "(STUBBED) called, value={}, buffer_size_1={}, buffer_data_2={}",
|
||||
value, buffer_data_1.size(), buffer_data_2.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result INewsDatabaseService::GetList(Out<s32> out_count, u32 value,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer_data,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_1,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_2) {
|
||||
LOG_WARNING(Service_BCAT, "(STUBBED) called, value={}, buffer_size_1={}, buffer_data_2={}",
|
||||
value, buffer_data_1.size(), buffer_data_2.size());
|
||||
*out_count = 0;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
} // namespace Service::News
|
||||
|
@ -19,6 +19,14 @@ public:
|
||||
|
||||
private:
|
||||
Result Count(Out<s32> out_count, InBuffer<BufferAttr_HipcPointer> buffer_data);
|
||||
|
||||
Result UpdateIntegerValueWithAddition(u32 value, InBuffer<BufferAttr_HipcPointer> buffer_data_1,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_2);
|
||||
|
||||
Result GetList(Out<s32> out_count, u32 value,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer_data,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_1,
|
||||
InBuffer<BufferAttr_HipcPointer> buffer_data_2);
|
||||
};
|
||||
|
||||
} // namespace Service::News
|
||||
|
@ -11,10 +11,10 @@ INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "I
|
||||
static const FunctionInfo functions[] = {
|
||||
{10100, nullptr, "PostLocalNews"},
|
||||
{20100, nullptr, "SetPassphrase"},
|
||||
{30100, C<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"},
|
||||
{30100, D<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"},
|
||||
{30101, nullptr, "GetTopicList"},
|
||||
{30110, nullptr, "Unknown30110"},
|
||||
{30200, nullptr, "IsSystemUpdateRequired"},
|
||||
{30200, D<&INewsService::IsSystemUpdateRequired>, "IsSystemUpdateRequired"},
|
||||
{30201, nullptr, "Unknown30201"},
|
||||
{30210, nullptr, "Unknown30210"},
|
||||
{30300, nullptr, "RequestImmediateReception"},
|
||||
@ -24,7 +24,7 @@ INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "I
|
||||
{30901, nullptr, "Unknown30901"},
|
||||
{30902, nullptr, "Unknown30902"},
|
||||
{40100, nullptr, "SetSubscriptionStatus"},
|
||||
{40101, nullptr, "RequestAutoSubscription"},
|
||||
{40101, D<&INewsService::RequestAutoSubscription>, "RequestAutoSubscription"},
|
||||
{40200, nullptr, "ClearStorage"},
|
||||
{40201, nullptr, "ClearSubscriptionStatusAll"},
|
||||
{90100, nullptr, "GetNewsDatabaseDump"},
|
||||
@ -43,4 +43,15 @@ Result INewsService::GetSubscriptionStatus(Out<u32> out_status,
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result INewsService::IsSystemUpdateRequired(Out<bool> out_is_system_update_required) {
|
||||
LOG_WARNING(Service_BCAT, "(STUBBED) called");
|
||||
*out_is_system_update_required = false;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result INewsService::RequestAutoSubscription(u64 value) {
|
||||
LOG_WARNING(Service_BCAT, "(STUBBED) called");
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
} // namespace Service::News
|
||||
|
@ -19,6 +19,10 @@ public:
|
||||
|
||||
private:
|
||||
Result GetSubscriptionStatus(Out<u32> out_status, InBuffer<BufferAttr_HipcPointer> buffer_data);
|
||||
|
||||
Result IsSystemUpdateRequired(Out<bool> out_is_system_update_required);
|
||||
|
||||
Result RequestAutoSubscription(u64 value);
|
||||
};
|
||||
|
||||
} // namespace Service::News
|
||||
|
@ -11,7 +11,7 @@ IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_)
|
||||
"IOverwriteEventHolder"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, C<&IOverwriteEventHolder::Get>, "Get"},
|
||||
{0, D<&IOverwriteEventHolder::Get>, "Get"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
|
@ -15,11 +15,11 @@ IServiceCreator::IServiceCreator(Core::System& system_, u32 permissions_, const
|
||||
: ServiceFramework{system_, name_}, permissions{permissions_} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, C<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
|
||||
{1, C<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
|
||||
{2, C<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
|
||||
{3, C<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
|
||||
{4, C<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
|
||||
{0, D<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
|
||||
{1, D<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
|
||||
{2, D<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
|
||||
{3, D<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
|
||||
{4, D<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
#include "common/assert.h"
|
||||
#include "common/fiber.h"
|
||||
@ -53,29 +54,30 @@ void Scheduler::Init() {
|
||||
}
|
||||
|
||||
void Scheduler::Resume() {
|
||||
bool pending_work;
|
||||
do {
|
||||
pending_work = false;
|
||||
{
|
||||
std::unique_lock lk(impl->scheduling_guard);
|
||||
impl->current_fifo = nullptr;
|
||||
auto it = impl->schedule_priority_queue.begin();
|
||||
while (it != impl->schedule_priority_queue.end()) {
|
||||
pending_work = ScheduleLevel(it->second);
|
||||
if (pending_work) {
|
||||
break;
|
||||
}
|
||||
it = std::next(it);
|
||||
}
|
||||
if (pending_work) {
|
||||
impl->must_reschedule = false;
|
||||
}
|
||||
while (UpdateHighestPriorityChannel()) {
|
||||
impl->current_fifo->scheduled_count++;
|
||||
Common::Fiber::YieldTo(impl->master_control, *impl->current_fifo->context);
|
||||
}
|
||||
}
|
||||
|
||||
bool Scheduler::UpdateHighestPriorityChannel() {
|
||||
std::scoped_lock lk(impl->scheduling_guard);
|
||||
|
||||
// Clear needs to schedule state.
|
||||
impl->must_reschedule = false;
|
||||
|
||||
// By default, we don't have a channel to schedule.
|
||||
impl->current_fifo = nullptr;
|
||||
|
||||
// Check each level to see if we can schedule.
|
||||
for (auto& level : impl->schedule_priority_queue) {
|
||||
if (ScheduleLevel(level.second)) {
|
||||
return true;
|
||||
}
|
||||
if (impl->current_fifo) {
|
||||
impl->current_fifo->scheduled_count++;
|
||||
Common::Fiber::YieldTo(impl->master_control, *impl->current_fifo->context);
|
||||
}
|
||||
} while (pending_work);
|
||||
}
|
||||
|
||||
// Nothing to schedule.
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Scheduler::ScheduleLevel(std::list<size_t>& queue) {
|
||||
@ -83,34 +85,48 @@ bool Scheduler::ScheduleLevel(std::list<size_t>& queue) {
|
||||
size_t min_schedule_count = std::numeric_limits<size_t>::max();
|
||||
for (auto id : queue) {
|
||||
auto& fifo = impl->gpfifos[id];
|
||||
std::scoped_lock lk2(fifo.guard);
|
||||
if (!fifo.pending_work.empty() || fifo.is_running) {
|
||||
if (fifo.scheduled_count > min_schedule_count) {
|
||||
continue;
|
||||
}
|
||||
if (fifo.scheduled_count < fifo.yield_count) {
|
||||
fifo.scheduled_count++;
|
||||
continue;
|
||||
}
|
||||
min_schedule_count = fifo.scheduled_count;
|
||||
impl->current_fifo = &fifo;
|
||||
found_anything = true;
|
||||
std::scoped_lock lk(fifo.guard);
|
||||
|
||||
// With no pending work and nothing running, this channel can't be scheduled.
|
||||
if (fifo.pending_work.empty() && !fifo.is_running) {
|
||||
continue;
|
||||
}
|
||||
// Prioritize channels at current priority which have been run the least.
|
||||
if (fifo.scheduled_count > min_schedule_count) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Try not to select the same channel we just yielded from.
|
||||
if (fifo.scheduled_count < fifo.yield_count) {
|
||||
fifo.scheduled_count++;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Update best selection.
|
||||
min_schedule_count = fifo.scheduled_count;
|
||||
impl->current_fifo = &fifo;
|
||||
found_anything = true;
|
||||
}
|
||||
return found_anything;
|
||||
}
|
||||
|
||||
void Scheduler::ChangePriority(s32 channel_id, u32 new_priority) {
|
||||
std::unique_lock lk(impl->scheduling_guard);
|
||||
std::scoped_lock lk(impl->scheduling_guard);
|
||||
// Ensure we are tracking this channel.
|
||||
auto fifo_it = impl->channel_gpfifo_ids.find(channel_id);
|
||||
if (fifo_it == impl->channel_gpfifo_ids.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Get the fifo and update its priority.
|
||||
const size_t fifo_id = fifo_it->second;
|
||||
auto& fifo = impl->gpfifos[fifo_id];
|
||||
const auto old_priority = fifo.info->priority;
|
||||
fifo.info->priority = new_priority;
|
||||
const auto old_priority = std::exchange(fifo.info->priority, new_priority);
|
||||
|
||||
// Create the new level if needed.
|
||||
impl->schedule_priority_queue.try_emplace(new_priority);
|
||||
|
||||
// Remove the old level and add to the new level.
|
||||
impl->schedule_priority_queue[new_priority].push_back(fifo_id);
|
||||
impl->schedule_priority_queue[old_priority].remove_if(
|
||||
[fifo_id](size_t id) { return id == fifo_id; });
|
||||
@ -118,6 +134,8 @@ void Scheduler::ChangePriority(s32 channel_id, u32 new_priority) {
|
||||
|
||||
void Scheduler::Yield() {
|
||||
ASSERT(impl->current_fifo != nullptr);
|
||||
|
||||
// Set yield count higher
|
||||
impl->current_fifo->yield_count = impl->current_fifo->scheduled_count + 1;
|
||||
Common::Fiber::YieldTo(impl->current_fifo->context, *impl->master_control);
|
||||
gpu.BindChannel(impl->current_fifo->bind_id);
|
||||
@ -126,50 +144,73 @@ void Scheduler::Yield() {
|
||||
void Scheduler::CheckStatus() {
|
||||
{
|
||||
std::unique_lock lk(impl->scheduling_guard);
|
||||
// If no reschedule is needed, don't transfer control
|
||||
if (!impl->must_reschedule) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Transfer control to the scheduler
|
||||
Common::Fiber::YieldTo(impl->current_fifo->context, *impl->master_control);
|
||||
gpu.BindChannel(impl->current_fifo->bind_id);
|
||||
}
|
||||
|
||||
void Scheduler::Push(s32 channel, CommandList&& entries) {
|
||||
std::unique_lock lk(impl->scheduling_guard);
|
||||
std::scoped_lock lk(impl->scheduling_guard);
|
||||
// Get and ensure we have this channel.
|
||||
auto it = impl->channel_gpfifo_ids.find(channel);
|
||||
ASSERT(it != impl->channel_gpfifo_ids.end());
|
||||
auto gpfifo_id = it->second;
|
||||
auto& fifo = impl->gpfifos[gpfifo_id];
|
||||
// Add the new new work to the channel.
|
||||
{
|
||||
std::scoped_lock lk2(fifo.guard);
|
||||
fifo.pending_work.emplace_back(std::move(entries));
|
||||
}
|
||||
if (impl->current_fifo != nullptr && impl->current_fifo->info->priority < fifo.info->priority) {
|
||||
impl->must_reschedule = true;
|
||||
|
||||
// If the current running FIFO is null or the one being pushed to then
|
||||
// just return
|
||||
if (impl->current_fifo == nullptr || impl->current_fifo == &fifo) {
|
||||
return;
|
||||
}
|
||||
|
||||
// If the current fifo has higher or equal priority to the current fifo then return
|
||||
if (impl->current_fifo->info->priority >= fifo.info->priority) {
|
||||
return;
|
||||
}
|
||||
// Mark scheduler update as required.
|
||||
impl->must_reschedule = true;
|
||||
}
|
||||
|
||||
void Scheduler::ChannelLoop(size_t gpfifo_id, s32 channel_id) {
|
||||
gpu.BindChannel(channel_id);
|
||||
auto& fifo = impl->gpfifos[gpfifo_id];
|
||||
while (true) {
|
||||
auto* channel_state = fifo.info.get();
|
||||
fifo.guard.lock();
|
||||
while (!fifo.pending_work.empty()) {
|
||||
fifo.is_running = true;
|
||||
{
|
||||
CommandList&& entries = std::move(fifo.pending_work.front());
|
||||
channel_state->dma_pusher->Push(std::move(entries));
|
||||
fifo.pending_work.pop_front();
|
||||
}
|
||||
fifo.guard.unlock();
|
||||
channel_state->dma_pusher->DispatchCalls();
|
||||
CheckStatus();
|
||||
fifo.guard.lock();
|
||||
auto* channel_state = fifo.info.get();
|
||||
const auto SendToPuller = [&] {
|
||||
std::scoped_lock lk(fifo.guard);
|
||||
if (fifo.pending_work.empty()) {
|
||||
// Stop if no work available.
|
||||
fifo.is_running = false;
|
||||
return false;
|
||||
}
|
||||
fifo.is_running = false;
|
||||
fifo.guard.unlock();
|
||||
// Otherwise, send work to puller and mark as running.
|
||||
CommandList&& entries = std::move(fifo.pending_work.front());
|
||||
channel_state->dma_pusher->Push(std::move(entries));
|
||||
fifo.pending_work.pop_front();
|
||||
fifo.is_running = true;
|
||||
// Succeed.
|
||||
return true;
|
||||
};
|
||||
// Inform the GPU about the current channel.
|
||||
gpu.BindChannel(channel_id);
|
||||
while (true) {
|
||||
while (SendToPuller()) {
|
||||
// Execute.
|
||||
channel_state->dma_pusher->DispatchCalls();
|
||||
// Reschedule.
|
||||
CheckStatus();
|
||||
}
|
||||
// Return to host execution when all work is completed.
|
||||
Common::Fiber::YieldTo(fifo.context, *impl->master_control);
|
||||
// Inform the GPU about the current channel.
|
||||
gpu.BindChannel(channel_id);
|
||||
}
|
||||
}
|
||||
|
@ -39,6 +39,7 @@ private:
|
||||
void ChannelLoop(size_t gpfifo_id, s32 channel_id);
|
||||
bool ScheduleLevel(std::list<size_t>& queue);
|
||||
void CheckStatus();
|
||||
bool UpdateHighestPriorityChannel();
|
||||
|
||||
struct SchedulerImpl;
|
||||
std::unique_ptr<SchedulerImpl> impl;
|
||||
|
@ -42,6 +42,7 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
|
||||
};
|
||||
}
|
||||
rescaleable = false;
|
||||
is_sparse = config.is_sparse != 0;
|
||||
tile_width_spacing = config.tile_width_spacing;
|
||||
if (config.texture_type != TextureType::Texture2D &&
|
||||
config.texture_type != TextureType::Texture2DNoMipmap) {
|
||||
|
@ -41,6 +41,7 @@ struct ImageInfo {
|
||||
bool downscaleable = false;
|
||||
bool forced_flushed = false;
|
||||
bool dma_downloaded = false;
|
||||
bool is_sparse = false;
|
||||
};
|
||||
|
||||
} // namespace VideoCommon
|
||||
|
@ -600,17 +600,17 @@ void TextureCache<P>::UnmapGPUMemory(size_t as_id, GPUVAddr gpu_addr, size_t siz
|
||||
[&](ImageId id, Image&) { deleted_images.push_back(id); });
|
||||
for (const ImageId id : deleted_images) {
|
||||
Image& image = slot_images[id];
|
||||
if (True(image.flags & ImageFlagBits::CpuModified)) {
|
||||
continue;
|
||||
if (False(image.flags & ImageFlagBits::CpuModified)) {
|
||||
image.flags |= ImageFlagBits::CpuModified;
|
||||
if (True(image.flags & ImageFlagBits::Tracked)) {
|
||||
UntrackImage(image, id);
|
||||
}
|
||||
}
|
||||
image.flags |= ImageFlagBits::CpuModified;
|
||||
|
||||
if (True(image.flags & ImageFlagBits::Remapped)) {
|
||||
continue;
|
||||
}
|
||||
image.flags |= ImageFlagBits::Remapped;
|
||||
if (True(image.flags & ImageFlagBits::Tracked)) {
|
||||
UntrackImage(image, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1469,7 +1469,8 @@ ImageId TextureCache<P>::JoinImages(const ImageInfo& info, GPUVAddr gpu_addr, DA
|
||||
const ImageId new_image_id = slot_images.insert(runtime, new_info, gpu_addr, cpu_addr);
|
||||
Image& new_image = slot_images[new_image_id];
|
||||
|
||||
if (!gpu_memory->IsContinuousRange(new_image.gpu_addr, new_image.guest_size_bytes)) {
|
||||
if (!gpu_memory->IsContinuousRange(new_image.gpu_addr, new_image.guest_size_bytes) &&
|
||||
new_info.is_sparse) {
|
||||
new_image.flags |= ImageFlagBits::Sparse;
|
||||
}
|
||||
|
||||
|
@ -190,10 +190,8 @@ void ControllerShortcut::ControllerUpdateEvent(Core::HID::ControllerTriggerType
|
||||
if (type != Core::HID::ControllerTriggerType::Button) {
|
||||
return;
|
||||
}
|
||||
if (!Settings::values.controller_navigation) {
|
||||
return;
|
||||
}
|
||||
if (button_sequence.npad.raw == Core::HID::NpadButton::None) {
|
||||
if (button_sequence.npad.raw == Core::HID::NpadButton::None &&
|
||||
button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user