mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-13 10:36:02 +00:00
trompetin17
256dff7fd4
Goal
----
Avoid corrupting the dynamic font-atlas on Vulkan by blocking any
re-uploads until the command buffer that created / last updated the
texture has actually been submitted.
What changed
------------
* **Queue-aware textures**
* Added `queueSubmitAware` flag to `IDevice::CreateTexture*` APIs.
* `Vulkan::CTexture` now stores two booleans:
- `m_QueueSubmitAware` – opt-in per texture.
- `m_PendingQueueSubmit` – set to *true* the moment an upload
is recorded, cleared once the submit scheduler has flushed.
* `CRingCommandContext::ScheduleUpload` marks the texture as
pending (`SetPendingQueueSubmit(true)`).
* **Device-side watcher**
* `Vulkan::CDevice` keeps a
`m_TextureUploadWatcherQueue`. Each frame it checks textures that
were uploaded ≥ `NUMBER_OF_FRAMES_IN_FLIGHT` frames ago and
clears their pending flag.
* New helpers
`ScheduleTextureUploadWatch `,
`ProcessTextureUploadWatchQueue()`.
* **Font code**
* Atlas texture is now created with
`queueSubmitAware = true`.
* `CFont::UploadTextureAtlasToGPU()` early-outs when
`IsPendingQueueSubmit()` returns *true*, instead of tracking a
submit-handle or the manual `m_IsLoadingTextureToGPU` flag
(removed).
Why this is better
------------------
The logic to wait for a flush is localised inside the rendering
backend, so `CFont` only needs to ask *“is my texture busy?”*.
This removes the fragile submit-handle bookkeeping and works even if
the scheduler issues multiple submits per frame in future.
Result
------
Atlas uploads are deferred until the previous submit completes,
eliminating the intermittent glyph corruption on the Vulkan backend
while leaving GL and the dummy backend unchanged.
70 lines
1.9 KiB
C++
70 lines
1.9 KiB
C++
/* Copyright (C) 2025 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_RENDERER_BACKEND_ITEXTURE
|
|
#define INCLUDED_RENDERER_BACKEND_ITEXTURE
|
|
|
|
#include "renderer/backend/Format.h"
|
|
#include "renderer/backend/IDeviceObject.h"
|
|
|
|
#include <cstdint>
|
|
|
|
namespace Renderer
|
|
{
|
|
|
|
namespace Backend
|
|
{
|
|
|
|
class ITexture : public IDeviceObject<ITexture>
|
|
{
|
|
public:
|
|
enum class Type
|
|
{
|
|
TEXTURE_2D,
|
|
TEXTURE_2D_MULTISAMPLE,
|
|
TEXTURE_CUBE
|
|
};
|
|
|
|
// Using a struct instead of a enum allows using the same syntax while
|
|
// avoiding adding operator overrides and additional checks on casts.
|
|
struct Usage
|
|
{
|
|
static constexpr uint32_t TRANSFER_SRC = 1u << 0u;
|
|
static constexpr uint32_t TRANSFER_DST = 1u << 1u;
|
|
static constexpr uint32_t SAMPLED = 1u << 2u;
|
|
static constexpr uint32_t COLOR_ATTACHMENT = 1u << 3u;
|
|
static constexpr uint32_t DEPTH_STENCIL_ATTACHMENT = 1u << 4u;
|
|
static constexpr uint32_t STORAGE = 1u << 5u;
|
|
};
|
|
|
|
virtual Type GetType() const = 0;
|
|
virtual uint32_t GetUsage() const = 0;
|
|
virtual Format GetFormat() const = 0;
|
|
|
|
virtual uint32_t GetWidth() const = 0;
|
|
virtual uint32_t GetHeight() const = 0;
|
|
virtual uint32_t GetMIPLevelCount() const = 0;
|
|
|
|
virtual bool IsPendingQueueSubmit() const = 0;
|
|
};
|
|
|
|
} // namespace Backend
|
|
|
|
} // namespace Renderer
|
|
|
|
#endif // INCLUDED_RENDERER_BACKEND_ITEXTURE
|