mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-15 22:54:00 +00:00
renderer_vulkan: don't pass null view when nullDescriptor is not supported
This commit is contained in:
parent
345ec25532
commit
d0a75580da
2 changed files with 26 additions and 8 deletions
|
@ -78,8 +78,15 @@ vk::Buffer CreateBuffer(const Device& device, const MemoryAllocator& memory_allo
|
||||||
}
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
Buffer::Buffer(BufferCacheRuntime&, VideoCommon::NullBufferParams null_params)
|
Buffer::Buffer(BufferCacheRuntime& runtime, VideoCommon::NullBufferParams null_params)
|
||||||
: VideoCommon::BufferBase<VideoCore::RasterizerInterface>(null_params), tracker{4096} {}
|
: VideoCommon::BufferBase<VideoCore::RasterizerInterface>(null_params), tracker{4096} {
|
||||||
|
if (runtime.device.HasNullDescriptor()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
device = &runtime.device;
|
||||||
|
buffer = runtime.CreateNullBuffer();
|
||||||
|
is_null = true;
|
||||||
|
}
|
||||||
|
|
||||||
Buffer::Buffer(BufferCacheRuntime& runtime, VideoCore::RasterizerInterface& rasterizer_,
|
Buffer::Buffer(BufferCacheRuntime& runtime, VideoCore::RasterizerInterface& rasterizer_,
|
||||||
VAddr cpu_addr_, u64 size_bytes_)
|
VAddr cpu_addr_, u64 size_bytes_)
|
||||||
|
@ -93,8 +100,12 @@ Buffer::Buffer(BufferCacheRuntime& runtime, VideoCore::RasterizerInterface& rast
|
||||||
|
|
||||||
VkBufferView Buffer::View(u32 offset, u32 size, VideoCore::Surface::PixelFormat format) {
|
VkBufferView Buffer::View(u32 offset, u32 size, VideoCore::Surface::PixelFormat format) {
|
||||||
if (!device) {
|
if (!device) {
|
||||||
// Null buffer, return a null descriptor
|
// Null buffer supported, return a null descriptor
|
||||||
return VK_NULL_HANDLE;
|
return VK_NULL_HANDLE;
|
||||||
|
} else if (is_null) {
|
||||||
|
// Null buffer not supported, adjust offset and size
|
||||||
|
offset = 0;
|
||||||
|
size = 0;
|
||||||
}
|
}
|
||||||
const auto it{std::ranges::find_if(views, [offset, size, format](const BufferView& view) {
|
const auto it{std::ranges::find_if(views, [offset, size, format](const BufferView& view) {
|
||||||
return offset == view.offset && size == view.size && format == view.format;
|
return offset == view.offset && size == view.size && format == view.format;
|
||||||
|
@ -622,9 +633,12 @@ void BufferCacheRuntime::BindTransformFeedbackBuffers(VideoCommon::HostBindings<
|
||||||
}
|
}
|
||||||
|
|
||||||
void BufferCacheRuntime::ReserveNullBuffer() {
|
void BufferCacheRuntime::ReserveNullBuffer() {
|
||||||
if (null_buffer) {
|
if (!null_buffer) {
|
||||||
return;
|
null_buffer = CreateNullBuffer();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
vk::Buffer BufferCacheRuntime::CreateNullBuffer() {
|
||||||
VkBufferCreateInfo create_info{
|
VkBufferCreateInfo create_info{
|
||||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||||
.pNext = nullptr,
|
.pNext = nullptr,
|
||||||
|
@ -639,15 +653,17 @@ void BufferCacheRuntime::ReserveNullBuffer() {
|
||||||
if (device.IsExtTransformFeedbackSupported()) {
|
if (device.IsExtTransformFeedbackSupported()) {
|
||||||
create_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT;
|
create_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT;
|
||||||
}
|
}
|
||||||
null_buffer = memory_allocator.CreateBuffer(create_info, MemoryUsage::DeviceLocal);
|
vk::Buffer ret = memory_allocator.CreateBuffer(create_info, MemoryUsage::DeviceLocal);
|
||||||
if (device.HasDebuggingToolAttached()) {
|
if (device.HasDebuggingToolAttached()) {
|
||||||
null_buffer.SetObjectNameEXT("Null buffer");
|
ret.SetObjectNameEXT("Null buffer");
|
||||||
}
|
}
|
||||||
|
|
||||||
scheduler.RequestOutsideRenderPassOperationContext();
|
scheduler.RequestOutsideRenderPassOperationContext();
|
||||||
scheduler.Record([buffer = *null_buffer](vk::CommandBuffer cmdbuf) {
|
scheduler.Record([buffer = *ret](vk::CommandBuffer cmdbuf) {
|
||||||
cmdbuf.FillBuffer(buffer, 0, VK_WHOLE_SIZE, 0);
|
cmdbuf.FillBuffer(buffer, 0, VK_WHOLE_SIZE, 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Vulkan
|
} // namespace Vulkan
|
||||||
|
|
|
@ -63,6 +63,7 @@ private:
|
||||||
vk::Buffer buffer;
|
vk::Buffer buffer;
|
||||||
std::vector<BufferView> views;
|
std::vector<BufferView> views;
|
||||||
VideoCommon::UsageTracker tracker;
|
VideoCommon::UsageTracker tracker;
|
||||||
|
bool is_null{};
|
||||||
};
|
};
|
||||||
|
|
||||||
class QuadArrayIndexBuffer;
|
class QuadArrayIndexBuffer;
|
||||||
|
@ -151,6 +152,7 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReserveNullBuffer();
|
void ReserveNullBuffer();
|
||||||
|
vk::Buffer CreateNullBuffer();
|
||||||
|
|
||||||
const Device& device;
|
const Device& device;
|
||||||
MemoryAllocator& memory_allocator;
|
MemoryAllocator& memory_allocator;
|
||||||
|
|
Loading…
Reference in a new issue