17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-31 04:12:20 +01:00

Walk the shadow passes and the culled model groups on worker threads in the Vulkan renderer

This commit is contained in:
2026-10-27 20:56:11 +01:00
parent c44b243698
commit 1447dcf075
55 changed files with 4114 additions and 427 deletions

View File

@@ -13,7 +13,12 @@ http://mozilla.org/MPL/2.0/.
// the uploads are copies through staging buffers recorded into the command buffer of uploads of the frame being made, which goes
// to the queue before the commands of the frame in the same submit; an upload asked for between the frames waits for the next
// one. every image has an id in one table (decision K10): ITexture::get_id() of the textures, the ids of the images of the user
// interface and the font of imgui are all ImTextureID, so the user interface draws any of them
// interface and the font of imgui are all ImTextureID, so the user interface draws any of them.
//
// the textures the draws of the walks need first are made by the background threads (gfx.vulkan.asyncresources, the stage M5):
// the data read, the image made and filled by the host (hostImageCopy, where the device and the format allow it) or its staging
// buffer filled, then the thread of the renderer puts the image in the table, with the copies of the staging buffer recorded, before
// the next frame is walked. the draw which asked for it goes without it (the white texture) till then
#pragma once
@@ -21,6 +26,8 @@ http://mozilla.org/MPL/2.0/.
#include "rendering/vulkan14/vulkan14descriptors.h"
#include "model/Texture.h"
#include <atomic>
#include <deque>
#include <memory>
#include <mutex>
#include <thread>
@@ -29,8 +36,10 @@ namespace vk14
{
class device;
class background_tasks;
// the uploads of data to the images
// the uploads of data to the images. asked for by any thread (the walks of the passes make the buffers of the geometry when they're
// first drawn); the staging buffers are made outside of the lock
class uploader
{
public:
@@ -39,8 +48,18 @@ class uploader
VkDeviceSize offset{0}; // in the data
VkExtent3D extent{1, 1, 1};
};
// an upload to an image with its data in a staging buffer, not recorded yet
struct prepared
{
std::shared_ptr<image> target;
std::shared_ptr<buffer> staging;
std::vector<level> levels;
bool mipmaps{false};
};
void init(allocator const &Allocator, deletion_queue &Deletions, VkPhysicalDevice Physical);
// back to the state before init(), the uploads waiting dropped
void reset();
// the commands of the uploads go to Commands until end_frame(); Value: the value of the timeline the gpu reaches when it's done
// with the frame. the uploads waiting from between the frames are recorded first
void begin_frame(command_stream *Commands, std::uint64_t Value);
@@ -54,6 +73,9 @@ class uploader
// copies Data into Image (the levels given, the others made by blits of the first one when Mipmaps), the image left ready to be
// sampled. Data is copied away. false: no staging memory, nothing will be copied
bool upload(std::shared_ptr<image> const &Image, void const *Data, VkDeviceSize Size, std::vector<level> const &Levels, bool const Mipmaps);
// the same in two steps: the staging buffer made and filled (Upload), and the copies recorded. false: no staging memory
bool prepare(std::shared_ptr<image> const &Image, void const *Data, VkDeviceSize Size, std::vector<level> const &Levels, bool const Mipmaps, prepared &Upload);
void submit(prepared &&Upload);
// copies Data into Target, done before the draws of the frame read it (and after the frames sent before did). Data holds the
// pieces of Parts (offset in Target, size) one after another; all of Data goes to the start of Target when there are none.
// false: no staging memory
@@ -65,6 +87,13 @@ class uploader
}
// whether the format can be filtered by blits (the mipmaps made on the gpu)
bool can_blit(VkFormat Format) const;
// whether images of the format are filled by the host (hostImageCopy) straight to the layout they're sampled in, without a loss of
// speed for the gpu. Copyable: the device does that for the layout (decided when the device is made)
void enable_host_copy(bool Copyable)
{
m_hostcopy = Copyable;
}
bool can_host_copy(VkFormat Format) const;
private:
struct job
@@ -79,20 +108,24 @@ class uploader
};
void record(job &Job);
mutable std::mutex m_mutex;
allocator const *m_allocator{nullptr};
deletion_queue *m_deletions{nullptr};
VkPhysicalDevice m_physical{VK_NULL_HANDLE};
command_stream *m_commands{nullptr};
std::uint64_t m_value{0};
std::atomic<std::uint64_t> m_value{0};
bool m_recorded{false};
// buffers were copied to in the frame: the barriers before the first copy and after the last one
bool m_buffercopies{false};
std::vector<job> m_pending;
std::uint64_t m_uploaded{0};
std::atomic<std::uint64_t> m_uploaded{0};
mutable std::unordered_map<VkFormat, bool> m_blittable;
bool m_hostcopy{false};
mutable std::unordered_map<VkFormat, bool> m_hostcopyable;
};
// the images the shaders can be given by an id
// the images the shaders can be given by an id. added to by any thread drawing (a texture made when a draw needs it), removed from
// and replaced in by the thread of the renderer, found by any thread; an entry found stays where it is while the frame is made
class image_table
{
public:
@@ -110,21 +143,27 @@ class image_table
void clear();
std::size_t size() const
{
std::lock_guard<std::mutex> lock(m_mutex);
return m_entries.size() - m_free.size();
}
private:
std::vector<entry> m_entries{entry{}};
mutable std::mutex m_mutex;
std::deque<entry> m_entries{entry{}};
std::vector<std::uint64_t> m_free;
};
struct vulkan14_texture;
// the textures given content by other threads, waiting for the thread of the renderer
// the textures given content by other threads, waiting for the thread of the renderer; and the ones made by the background threads
struct pending_textures
{
std::mutex mutex;
std::vector<vulkan14_texture *> textures;
std::vector<vulkan14_texture *> made;
// the textures made by the background threads since the start, and how many draws went without one
std::atomic<std::size_t> made_count{0};
std::atomic<std::size_t> late_count{0};
};
// what the images of the renderer need from it
@@ -139,6 +178,8 @@ struct resources
// the thread of the renderer: the content given by other threads waits for it (update_from_memory())
std::thread::id thread;
pending_textures *pending{nullptr};
// the threads making the textures the draws need first (gfx.vulkan.asyncresources), null: made by the draw
background_tasks *background{nullptr};
// the ray tracing is on (gfx.raytracing): the geometry is built into acceleration structures and read by its device address
bool raytracing{false};
};
@@ -163,6 +204,11 @@ struct vulkan14_texture : public texture_source
~vulkan14_texture() override;
bool create(bool const Static = false) override;
// the texture for a draw of the walks: true when it's made, otherwise it's made by the background threads (or made now, without
// them) and the draw goes without it
bool request_background();
// the thread of the renderer takes over what a background thread made of the texture
void publish();
void release() override;
// as the opengl textures give it: one not made yet has no id of 0, which the materials take for a texture which is missing
size_t get_id() const override
@@ -174,6 +220,11 @@ struct vulkan14_texture : public texture_source
{
return m_made;
}
// a background thread makes it: its data isn't for the other threads to read
bool busy() const override
{
return m_job != job_none;
}
void destroy() override;
// the content given by update_from_memory() from another thread, uploaded by the thread of the renderer
@@ -191,11 +242,43 @@ struct vulkan14_texture : public texture_source
private:
void upload_rgba(std::uint8_t const *Data, std::size_t Width, std::size_t Height);
// the data of the texture made into an image (Background: by a background thread, which leaves the images table and the uploads
// of the frames to the thread of the renderer): no data yet, made now, failed now, made (or failed) before
enum class make_result
{
none,
made,
failed,
done
};
make_result make(bool const Background);
// waits for the thread making the texture, if there's one
void wait_job() const;
// the making of the texture taken by the calling thread (create()), after another thread making it is done; false when it was made by
// a background thread and waits for the thread of the renderer
bool claim();
resources const &m_resources;
std::shared_ptr<image> m_image;
std::uint64_t m_id{0};
bool m_made{false};
std::atomic<bool> m_made{false};
// the work on the texture: none, a background thread making it, made by it and waiting for publish(), a thread making it now (create(),
// publish(): the walks of the passes on several threads may need it at once, M2)
enum job_state : int
{
job_none,
job_running,
job_done,
job_making
};
std::atomic<int> m_job{job_none};
// what the background thread made: the image and its sampler, its upload when the host didn't fill it, or that the texture failed
std::shared_ptr<image> m_madeimage;
VkSampler m_madesampler{VK_NULL_HANDLE};
uploader::prepared m_madeupload;
bool m_madestaged{false};
bool m_madefailed{false};
bool m_madeempty{false};
// content from another thread, waiting for the thread of the renderer
std::mutex m_pendingmutex;
std::vector<std::uint8_t> m_pending;