N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renderer_vulkan: Remove vulkan prefix in SetObjectName

Browse source
This commit is contained in:
GPUCode 2024-01-29 22:00:25 +02:00
parent 2bcbfeb861
commit 9f5c8d0e2f
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/video_core/renderer_vulkan/vk_master_semaphore.cpp
View file

@ -98,8 +98,7 @@ void MasterSemaphoreTimeline::SubmitWork(vk::CommandBuffer cmdbuf, vk::Semaphore
try { try {
instance.GetGraphicsQueue().submit(submit_info); instance.GetGraphicsQueue().submit(submit_info);
} catch (vk::DeviceLostError& err) { } catch (vk::DeviceLostError& err) {
LOG_CRITICAL(Render_Vulkan, "Device lost during submit: {}", err.what()); UNREACHABLE_MSG("Device lost during submit: {}", err.what());
UNREACHABLE();
} }
} }
@ -114,7 +113,8 @@ MasterSemaphoreFence::MasterSemaphoreFence(const Instance& instance_) : instance
} }
MasterSemaphoreFence::~MasterSemaphoreFence() { MasterSemaphoreFence::~MasterSemaphoreFence() {
std::ranges::for_each(free_queue, [this](auto fence) { instance.GetDevice().destroyFence(fence); }); std::ranges::for_each(free_queue,
[this](auto fence) { instance.GetDevice().destroyFence(fence); });
} }
void MasterSemaphoreFence::Refresh() {} void MasterSemaphoreFence::Refresh() {}
@ -150,8 +150,7 @@ void MasterSemaphoreFence::SubmitWork(vk::CommandBuffer cmdbuf, vk::Semaphore wa
try { try {
instance.GetGraphicsQueue().submit(submit_info, fence); instance.GetGraphicsQueue().submit(submit_info, fence);
} catch (vk::DeviceLostError& err) { } catch (vk::DeviceLostError& err) {
LOG_CRITICAL(Render_Vulkan, "Device lost during submit: {}", err.what()); UNREACHABLE_MSG("Device lost during submit: {}", err.what());
UNREACHABLE();
} }
std::scoped_lock lock{wait_mutex}; std::scoped_lock lock{wait_mutex};
@ -176,8 +175,7 @@ void MasterSemaphoreFence::WaitThread(std::stop_token token) {
const vk::Result result = device.waitForFences(fence, true, WAIT_TIMEOUT); const vk::Result result = device.waitForFences(fence, true, WAIT_TIMEOUT);
if (result != vk::Result::eSuccess) { if (result != vk::Result::eSuccess) {
LOG_CRITICAL(Render_Vulkan, "Fence wait failed with error {}", vk::to_string(result)); UNREACHABLE_MSG("Fence wait failed with error {}", vk::to_string(result));
UNREACHABLE();
} }
device.resetFences(fence); device.resetFences(fence);

1
src/video_core/renderer_vulkan/vk_master_semaphore.h
View file

@ -73,6 +73,7 @@ private:
class MasterSemaphoreFence : public MasterSemaphore { class MasterSemaphoreFence : public MasterSemaphore {
using Waitable = std::pair<vk::Fence, u64>; using Waitable = std::pair<vk::Fence, u64>;
public: public:
explicit MasterSemaphoreFence(const Instance& instance); explicit MasterSemaphoreFence(const Instance& instance);
~MasterSemaphoreFence() override; ~MasterSemaphoreFence() override;

8
src/video_core/renderer_vulkan/vk_swapchain.cpp
View file

@ -250,10 +250,8 @@ void Swapchain::RefreshSemaphores() {
if (instance.HasDebuggingToolAttached()) { if (instance.HasDebuggingToolAttached()) {
for (u32 i = 0; i < image_count; ++i) { for (u32 i = 0; i < image_count; ++i) {
Vulkan::SetObjectName(device, image_acquired[i], SetObjectName(device, image_acquired[i], "Swapchain Semaphore: image_acquired {}", i);
"Swapchain Semaphore: image_acquired {}", i); SetObjectName(device, present_ready[i], "Swapchain Semaphore: present_ready {}", i);
Vulkan::SetObjectName(device, present_ready[i], "Swapchain Semaphore: present_ready {}",
i);
} }
} }
} }
@ -265,7 +263,7 @@ void Swapchain::SetupImages() {
if (instance.HasDebuggingToolAttached()) { if (instance.HasDebuggingToolAttached()) {
for (u32 i = 0; i < image_count; ++i) { for (u32 i = 0; i < image_count; ++i) {
Vulkan::SetObjectName(device, images[i], "Swapchain Image {}", i); SetObjectName(device, images[i], "Swapchain Image {}", i);
} }
} }
} }

6
src/video_core/renderer_vulkan/vk_texture_runtime.cpp
View file

@ -206,8 +206,8 @@ Handle MakeHandle(const Instance* instance, u32 width, u32 height, u32 levels, T
vk::UniqueImageView image_view = instance->GetDevice().createImageViewUnique(view_info); vk::UniqueImageView image_view = instance->GetDevice().createImageViewUnique(view_info);
if (!debug_name.empty() && instance->HasDebuggingToolAttached()) { if (!debug_name.empty() && instance->HasDebuggingToolAttached()) {
Vulkan::SetObjectName(instance->GetDevice(), image, debug_name); SetObjectName(instance->GetDevice(), image, debug_name);
Vulkan::SetObjectName(instance->GetDevice(), image_view.get(), "{} View({})", debug_name, SetObjectName(instance->GetDevice(), image_view.get(), "{} View({})", debug_name,
vk::to_string(aspect)); vk::to_string(aspect));
} }
@ -1090,7 +1090,7 @@ void Surface::ScaleUp(u32 new_scale) {
vk::PipelineStageFlagBits::eTopOfPipe, vk::PipelineStageFlagBits::eTopOfPipe,
vk::DependencyFlagBits::eByRegion, {}, {}, barriers); vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
}); });
LOG_INFO(HW_GPU, "Surface scale up!");
for (u32 level = 0; level < levels; level++) { for (u32 level = 0; level < levels; level++) {
const VideoCore::TextureBlit blit = { const VideoCore::TextureBlit blit = {
.src_level = level, .src_level = level,