From e1c13bbc081d8ccc6dabbd3b0d76cc1d101ebfa7 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Sun, 8 May 2022 19:27:06 +0100 Subject: [PATCH] Update hades --- app/libraries/shader-compiler | 2 +- app/src/main/cpp/skyline/gpu/shader_manager.cpp | 4 ++++ app/src/main/cpp/skyline/gpu/texture/texture.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/libraries/shader-compiler b/app/libraries/shader-compiler index 461cfccb..e929af7a 160000 --- a/app/libraries/shader-compiler +++ b/app/libraries/shader-compiler @@ -1 +1 @@ -Subproject commit 461cfccb2f2a19b457be36495288671a88380937 +Subproject commit e929af7ae5555edd9e6534db89ca7ac6297e450d diff --git a/app/src/main/cpp/skyline/gpu/shader_manager.cpp b/app/src/main/cpp/skyline/gpu/shader_manager.cpp index 1c9943c7..d2c853d3 100644 --- a/app/src/main/cpp/skyline/gpu/shader_manager.cpp +++ b/app/src/main/cpp/skyline/gpu/shader_manager.cpp @@ -135,6 +135,8 @@ namespace skyline::gpu { [[nodiscard]] std::array WorkgroupSize() const final { return {0, 0, 0}; // Only relevant for compute shaders } + + void Dump(u64 hash) final {} }; /** @@ -174,6 +176,8 @@ namespace skyline::gpu { [[nodiscard]] std::array WorkgroupSize() const final { return {0, 0, 0}; // Only relevant for compute shaders } + + void Dump(u64 hash) final {} }; constexpr ShaderManager::ConstantBufferWord::ConstantBufferWord(u32 index, u32 offset, u32 value) : index(index), offset(offset), value(value) {} diff --git a/app/src/main/cpp/skyline/gpu/texture/texture.cpp b/app/src/main/cpp/skyline/gpu/texture/texture.cpp index fc16140c..d5bbd192 100644 --- a/app/src/main/cpp/skyline/gpu/texture/texture.cpp +++ b/app/src/main/cpp/skyline/gpu/texture/texture.cpp @@ -485,7 +485,7 @@ namespace skyline::gpu { WaitOnFence(); if (tiling == vk::ImageTiling::eOptimal || !std::holds_alternative(backing)) { - auto size{format->GetSize(dimensions)}; + auto size{format->GetSize(dimensions) * layerCount}; auto stagingBuffer{gpu.memory.AllocateStagingBuffer(size)}; auto lCycle{gpu.scheduler.Submit([&](vk::raii::CommandBuffer &commandBuffer) {