tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Fix dynamic texture resource management (#4337)

Browse Source
This commit is contained in:
Adrian Cojocaru
2026-06-23 18:39:50 +03:00
committed by GitHub
parent 0724dcf58d
commit e7a373b013
16 changed files with 120 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbgl/gfx/dynamic_texture.hpp
View File

@@ -14,6 +14,7 @@ namespace gfx {
class Context;
class Texture2D;
class UploadPass;
using Texture2DPtr = std::shared_ptr<Texture2D>;
class TextureHandle {
@@ -60,7 +61,7 @@ public:
std::optional<TextureHandle> addImage(const uint8_t* pixelData, const Size& imageSize, int32_t uniqueId = -1);
virtual void uploadImage(const uint8_t* pixelData, TextureHandle& texHandle);
virtual void uploadDeferredImages() {};
virtual void uploadDeferredImages(UploadPass&) {};
virtual bool removeTexture(const TextureHandle& texHandle);
protected:

1
include/mbgl/gfx/dynamic_texture_atlas.hpp
View File

@@ -37,6 +37,7 @@ public:
const ImageVersionMap& versionMap);
void removeTextures(const std::vector<TextureHandle>& textureHandles, const DynamicTexturePtr& dynamicTexture);
void removeUnusedDynamicTextures();
private:
Context& context;

2
include/mbgl/gl/dynamic_texture.hpp
View File

@@ -12,7 +12,7 @@ public:
DynamicTexture(Context& context, Size size, gfx::TexturePixelType pixelType);
void uploadImage(const uint8_t* pixelData, gfx::TextureHandle& texHandle) override;
void uploadDeferredImages() override;
void uploadDeferredImages(gfx::UploadPass&) override;
bool removeTexture(const gfx::TextureHandle& texHandle) override;
using ImagesToUpload =

6
include/mbgl/vulkan/dynamic_texture.hpp
View File

@@ -10,7 +10,7 @@ namespace vulkan {
class Context;
struct BufferAllocation;
using UniqueBufferAllocation = std::unique_ptr<BufferAllocation>;
using SharedBufferAllocation = std::shared_ptr<BufferAllocation>;
class DynamicTexture : public gfx::DynamicTexture {
public:
@@ -18,7 +18,7 @@ public:
~DynamicTexture() override;
void uploadImage(const uint8_t* pixelData, gfx::TextureHandle& texHandle) override;
void uploadDeferredImages() override;
void uploadDeferredImages(gfx::UploadPass&) override;
bool removeTexture(const gfx::TextureHandle& texHandle) override;
#if DYNAMIC_TEXTURE_VULKAN_MULTITHREADED_UPLOAD
@@ -26,7 +26,7 @@ public:
std::unordered_map<gfx::TextureHandle, std::shared_ptr<vulkan::Texture2D>, gfx::TextureHandle::Hasher>;
#else
using TextureBuffersToUpload =
std::unordered_map<gfx::TextureHandle, UniqueBufferAllocation, gfx::TextureHandle::Hasher>;
std::unordered_map<gfx::TextureHandle, SharedBufferAllocation, gfx::TextureHandle::Hasher>;
#endif
private:

3
include/mbgl/vulkan/upload_pass.hpp
View File

@@ -38,6 +38,9 @@ public:
gfx::Context& getContext() override;
const gfx::Context& getContext() const override;
CommandEncoder& getCommandEncoder() { return commandEncoder; }
const CommandEncoder& getCommandEncoder() const { return commandEncoder; }
std::unique_ptr<gfx::VertexBufferResource> createVertexBufferResource(const void* data,
std::size_t size,
gfx::BufferUsageType,

2
include/mbgl/webgpu/dynamic_texture.hpp
View File

@@ -12,7 +12,7 @@ public:
DynamicTexture(Context& context, Size size, gfx::TexturePixelType pixelType);
void uploadImage(const uint8_t* pixelData, gfx::TextureHandle& texHandle) override;
void uploadDeferredImages() override;
void uploadDeferredImages(gfx::UploadPass&) override;
bool removeTexture(const gfx::TextureHandle& texHandle) override;
using ImagesToUpload =