Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-10-25 10:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allocated texture, shader and dynamic buffer tables in blocks as handles are used. (#4024)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-10-04 08:45:00 -07:00
committed by GitHub
parent aa10f3accb
commit 01e69a6307
9 changed files with 493 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/renderer_vk.cpp
View File

@@ -2557,30 +2557,15 @@ VK_IMPORT_DEVICE
m_scratchStagingBuffer[ii].destroy();
}
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
{
m_frameBuffers[ii].destroy();
}
m_frameBuffers.each([](FrameBufferVK& _frameBuffer) { _frameBuffer.destroy(); });
for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii)
{
m_indexBuffers[ii].destroy();
}
m_indexBuffers.each([](IndexBufferVK& _indexBuffer) { _indexBuffer.destroy(); });
for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexBuffers); ++ii)
{
m_vertexBuffers[ii].destroy();
}
m_vertexBuffers.each([](VertexBufferVK& _vertexBuffer) { _vertexBuffer.destroy(); });
for (uint32_t ii = 0; ii < BX_COUNTOF(m_shaders); ++ii)
{
m_shaders[ii].destroy();
}
m_shaders.each([](ShaderVK& _shader) { _shader.destroy(); });
for (uint32_t ii = 0; ii < BX_COUNTOF(m_textures); ++ii)
{
m_textures[ii].destroy();
}
m_textures.each([](TextureVK& _texture) { _texture.destroy(); });
m_backBuffer.destroy();
@@ -2677,12 +2662,13 @@ VK_IMPORT_DEVICE
void createIndexBuffer(IndexBufferHandle _handle, const Memory* _mem, uint16_t _flags) override
{
m_indexBuffers[_handle.idx].create(m_commandBuffer, _mem->size, _mem->data, _flags, false);
m_indexBuffers.alloc(_handle.idx).create(m_commandBuffer, _mem->size, _mem->data, _flags, false);
}
void destroyIndexBuffer(IndexBufferHandle _handle) override
{
m_indexBuffers[_handle.idx].destroy();
m_indexBuffers.release(_handle.idx);
}
void createVertexLayout(VertexLayoutHandle _handle, const VertexLayout& _layout) override
@@ -2698,17 +2684,18 @@ VK_IMPORT_DEVICE
void createVertexBuffer(VertexBufferHandle _handle, const Memory* _mem, VertexLayoutHandle _layoutHandle, uint16_t _flags) override
{
m_vertexBuffers[_handle.idx].create(m_commandBuffer, _mem->size, _mem->data, _layoutHandle, _flags);
m_vertexBuffers.alloc(_handle.idx).create(m_commandBuffer, _mem->size, _mem->data, _layoutHandle, _flags);
}
void destroyVertexBuffer(VertexBufferHandle _handle) override
{
m_vertexBuffers[_handle.idx].destroy();
m_vertexBuffers.release(_handle.idx);
}
void createDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size, uint16_t _flags) override
{
m_indexBuffers[_handle.idx].create(m_commandBuffer, _size, NULL, _flags, false);
m_indexBuffers.alloc(_handle.idx).create(m_commandBuffer, _size, NULL, _flags, false);
}
void updateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, const Memory* _mem) override
@@ -2719,12 +2706,13 @@ VK_IMPORT_DEVICE
void destroyDynamicIndexBuffer(IndexBufferHandle _handle) override
{
m_indexBuffers[_handle.idx].destroy();
m_indexBuffers.release(_handle.idx);
}
void createDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size, uint16_t _flags) override
{
VertexLayoutHandle layoutHandle = BGFX_INVALID_HANDLE;
m_vertexBuffers[_handle.idx].create(m_commandBuffer, _size, NULL, layoutHandle, _flags);
m_vertexBuffers.alloc(_handle.idx).create(m_commandBuffer, _size, NULL, layoutHandle, _flags);
}
void updateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, const Memory* _mem) override
@@ -2735,31 +2723,34 @@ VK_IMPORT_DEVICE
void destroyDynamicVertexBuffer(VertexBufferHandle _handle) override
{
m_vertexBuffers[_handle.idx].destroy();
m_vertexBuffers.release(_handle.idx);
}
void createShader(ShaderHandle _handle, const Memory* _mem) override
{
m_shaders[_handle.idx].create(_mem);
m_shaders.alloc(_handle.idx).create(_mem);
}
void destroyShader(ShaderHandle _handle) override
{
m_shaders[_handle.idx].destroy();
m_shaders.release(_handle.idx);
}
void createProgram(ProgramHandle _handle, ShaderHandle _vsh, ShaderHandle _fsh) override
{
m_program[_handle.idx].create(&m_shaders[_vsh.idx], isValid(_fsh) ? &m_shaders[_fsh.idx] : NULL);
m_program.alloc(_handle.idx).create(&m_shaders[_vsh.idx], isValid(_fsh) ? &m_shaders[_fsh.idx] : NULL);
}
void destroyProgram(ProgramHandle _handle) override
{
m_program[_handle.idx].destroy();
m_program.release(_handle.idx);
}
void* createTexture(TextureHandle _handle, const Memory* _mem, uint64_t _flags, uint8_t _skip, uint64_t _external) override
{
return m_textures[_handle.idx].create(m_commandBuffer, _mem, _flags, _skip, _external);
return m_textures.alloc(_handle.idx).create(m_commandBuffer, _mem, _flags, _skip, _external);
}
void updateTexture(TextureHandle _handle, uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem) override
@@ -2879,11 +2870,12 @@ VK_IMPORT_DEVICE
{
m_imageViewCache.invalidateWithParent(_handle.idx);
m_textures[_handle.idx].destroy();
m_textures.release(_handle.idx);
}
void createFrameBuffer(FrameBufferHandle _handle, uint8_t _num, const Attachment* _attachment) override
{
m_frameBuffers[_handle.idx].create(_num, _attachment);
m_frameBuffers.alloc(_handle.idx).create(_num, _attachment);
}
void createFrameBuffer(FrameBufferHandle _handle, const SwapChain& _desc) override
@@ -2900,7 +2892,7 @@ VK_IMPORT_DEVICE
uint16_t denseIdx = m_numWindows++;
m_windows[denseIdx] = _handle;
VK_CHECK(m_frameBuffers[_handle.idx].create(denseIdx, _desc) );
VK_CHECK(m_frameBuffers.alloc(_handle.idx).create(denseIdx, _desc) );
}
void resizeFrameBuffer(FrameBufferHandle _handle, const SwapChain& _desc) override
@@ -2918,6 +2910,7 @@ VK_IMPORT_DEVICE
}
uint16_t denseIdx = frameBuffer.destroy();
m_frameBuffers.release(_handle.idx);
if (UINT16_MAX != denseIdx)
{
--m_numWindows;
@@ -3186,10 +3179,7 @@ VK_IMPORT_DEVICE
void preReset()
{
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
{
m_frameBuffers[ii].preReset();
}
m_frameBuffers.each([](FrameBufferVK& _frameBuffer) { _frameBuffer.preReset(); });
if (m_captureSize > 0)
{
@@ -3203,10 +3193,7 @@ VK_IMPORT_DEVICE
void postReset()
{
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
{
m_frameBuffers[ii].postReset();
}
m_frameBuffers.each([](FrameBufferVK& _frameBuffer) { _frameBuffer.postReset(); });
if (m_reset & BGFX_RESET_CAPTURE)
{
@@ -3252,11 +3239,10 @@ VK_IMPORT_DEVICE
m_mainSwapChain.width = _swapChain.width;
m_mainSwapChain.height = _swapChain.height;
for (uint32_t ii = 0; ii < BX_COUNTOF(m_frameBuffers); ++ii)
{
m_frameBuffers[ii].preReset();
m_frameBuffers[ii].postReset();
}
m_frameBuffers.each([](FrameBufferVK& _frameBuffer) {
_frameBuffer.preReset();
_frameBuffer.postReset();
});
}
return suspended;
@@ -5268,13 +5254,13 @@ VK_IMPORT_DEVICE
void* m_renderDocDll;
void* m_vulkan1Dll;
IndexBufferVK m_indexBuffers[BGFX_CONFIG_MAX_INDEX_BUFFERS];
VertexBufferVK m_vertexBuffers[BGFX_CONFIG_MAX_VERTEX_BUFFERS];
ShaderVK m_shaders[BGFX_CONFIG_MAX_SHADERS];
ProgramVK m_program[BGFX_CONFIG_MAX_PROGRAMS];
TextureVK m_textures[BGFX_CONFIG_MAX_TEXTURES];
HandleArenaT<IndexBufferVK, BGFX_CONFIG_MAX_INDEX_BUFFERS> m_indexBuffers;
HandleArenaT<VertexBufferVK, BGFX_CONFIG_MAX_VERTEX_BUFFERS> m_vertexBuffers;
HandleArenaT<ShaderVK, BGFX_CONFIG_MAX_SHADERS> m_shaders;
HandleArenaT<ProgramVK, BGFX_CONFIG_MAX_PROGRAMS> m_program;
HandleArenaT<TextureVK, BGFX_CONFIG_MAX_TEXTURES> m_textures;
VertexLayout m_vertexLayouts[BGFX_CONFIG_MAX_VERTEX_LAYOUTS];
FrameBufferVK m_frameBuffers[BGFX_CONFIG_MAX_FRAME_BUFFERS];
HandleArenaT<FrameBufferVK, BGFX_CONFIG_MAX_FRAME_BUFFERS> m_frameBuffers;
Matrix4 m_predefinedUniforms[PredefinedUniform::Count];
@@ -7018,7 +7004,7 @@ VK_DESTROY
m_textureDeviceMem = {};
m_flags |= BGFX_SAMPLER_INTERNAL_SHARED;
s_renderVK->m_cmd.addExternal({ uint16_t(this - s_renderVK->m_textures) });
s_renderVK->m_cmd.addExternal({ s_renderVK->m_textures.indexOf(*this) });
}
else
{
@@ -7185,7 +7171,7 @@ VK_DESTROY
BX_TRACE(
"Texture %3d: %s (requested: %s), %dx%dx%d%s RT[%c], BO[%c], CW[%c]%s."
, (int)(this - s_renderVK->m_textures)
, s_renderVK->m_textures.indexOf(*this)
, getName( (TextureFormat::Enum)m_textureFormat)
, getName( (TextureFormat::Enum)m_requestedFormat)
, ti.width
@@ -7437,7 +7423,7 @@ VK_DESTROY
if (external)
{
s_renderVK->m_cmd.removeExternal({ uint16_t(this - s_renderVK->m_textures) });
s_renderVK->m_cmd.removeExternal({ s_renderVK->m_textures.indexOf(*this) });
}
else
{
@@ -10385,6 +10371,13 @@ VK_DESTROY
void RendererContextVK::submit(Frame* _render, const ClearQuad& /*_clearQuad*/, const MipGen& /*_mipGen*/, TextVideoMemBlitter& _textVideoMemBlitter)
{
m_indexBuffers.freeUnused();
m_vertexBuffers.freeUnused();
m_shaders.freeUnused();
m_program.freeUnused();
m_textures.freeUnused();
m_frameBuffers.freeUnused();
if (m_lost
|| updateResolution(_render->m_mainSwapChain, _render->m_reset) )
{