Update hades

This commit is contained in:
Billy Laws 2022-05-08 19:27:06 +01:00
parent b307fca115
commit e1c13bbc08
3 changed files with 6 additions and 2 deletions

@ -1 +1 @@
Subproject commit 461cfccb2f2a19b457be36495288671a88380937 Subproject commit e929af7ae5555edd9e6534db89ca7ac6297e450d

View File

@ -135,6 +135,8 @@ namespace skyline::gpu {
[[nodiscard]] std::array<u32, 3> WorkgroupSize() const final { [[nodiscard]] std::array<u32, 3> WorkgroupSize() const final {
return {0, 0, 0}; // Only relevant for compute shaders return {0, 0, 0}; // Only relevant for compute shaders
} }
void Dump(u64 hash) final {}
}; };
/** /**
@ -174,6 +176,8 @@ namespace skyline::gpu {
[[nodiscard]] std::array<u32, 3> WorkgroupSize() const final { [[nodiscard]] std::array<u32, 3> WorkgroupSize() const final {
return {0, 0, 0}; // Only relevant for compute shaders 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) {} constexpr ShaderManager::ConstantBufferWord::ConstantBufferWord(u32 index, u32 offset, u32 value) : index(index), offset(offset), value(value) {}

View File

@ -485,7 +485,7 @@ namespace skyline::gpu {
WaitOnFence(); WaitOnFence();
if (tiling == vk::ImageTiling::eOptimal || !std::holds_alternative<memory::Image>(backing)) { if (tiling == vk::ImageTiling::eOptimal || !std::holds_alternative<memory::Image>(backing)) {
auto size{format->GetSize(dimensions)}; auto size{format->GetSize(dimensions) * layerCount};
auto stagingBuffer{gpu.memory.AllocateStagingBuffer(size)}; auto stagingBuffer{gpu.memory.AllocateStagingBuffer(size)};
auto lCycle{gpu.scheduler.Submit([&](vk::raii::CommandBuffer &commandBuffer) { auto lCycle{gpu.scheduler.Submit([&](vk::raii::CommandBuffer &commandBuffer) {