15d88e544a
Since the introduction of storage buffers in Blender, the calling code has been responsible for ensuring the buffer meets allocation requirements. All backends require the allocation size to be divisible by 16 bytes. Until now, this was sufficient, but with GPU subdivision changes, an external library must also adhere to these requirements. For OpenSubdiv (OSD), some buffers are not 16-byte aligned, leading to potential misallocation. Currently, this is mitigated by allocating a few extra bytes, but this approach has the drawback of potentially reading unintended bytes beyond the source buffer. This PR adopts a similar approach to vertex buffers: the backend handles extra byte allocation while ensuring data uploads and downloads function correctly without requiring those additional bytes. No changes were needed for Metal, as its allocation size is already aligned to 256 bytes. **Alternative solutions considered**: - Copying the CPU buffer to a larger buffer when needed (performance impact). - Modifying OSD buffers to allocate extra space (requires changes to an external library). - Implementing GPU_storagebuf_update_sub. Ref #135873 Pull Request: https://projects.blender.org/blender/blender/pulls/135716
131 lines
2.8 KiB
C++
131 lines
2.8 KiB
C++
/* SPDX-FileCopyrightText: 2022 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup gpu
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
#include <cstring>
|
|
|
|
#include "BLI_string.h"
|
|
|
|
#include "BKE_global.hh"
|
|
|
|
#include "gpu_backend.hh"
|
|
|
|
#include "GPU_storage_buffer.hh"
|
|
#include "GPU_vertex_buffer.hh" /* For GPUUsageType. */
|
|
|
|
#include "gpu_context_private.hh"
|
|
#include "gpu_storage_buffer_private.hh"
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
/** \name Creation & Deletion
|
|
* \{ */
|
|
|
|
namespace blender::gpu {
|
|
|
|
StorageBuf::StorageBuf(size_t size, const char *name)
|
|
{
|
|
size_in_bytes_ = size;
|
|
STRNCPY(name_, name);
|
|
}
|
|
|
|
StorageBuf::~StorageBuf()
|
|
{
|
|
MEM_SAFE_FREE(data_);
|
|
}
|
|
|
|
} // namespace blender::gpu
|
|
|
|
/** \} */
|
|
|
|
/* -------------------------------------------------------------------- */
|
|
/** \name C-API
|
|
* \{ */
|
|
|
|
using namespace blender::gpu;
|
|
|
|
GPUStorageBuf *GPU_storagebuf_create_ex(size_t size,
|
|
const void *data,
|
|
GPUUsageType usage,
|
|
const char *name)
|
|
{
|
|
StorageBuf *ssbo = GPUBackend::get()->storagebuf_alloc(size, usage, name);
|
|
/* Direct init. */
|
|
if (data != nullptr) {
|
|
ssbo->update(data);
|
|
}
|
|
else if (G.debug & G_DEBUG_GPU) {
|
|
/* Fill the buffer with poison values.
|
|
* (NaN for floats, -1 for `int` and "max value" for `uint`). */
|
|
blender::Vector<uchar> uninitialized_data(size, 0xFF);
|
|
ssbo->update(uninitialized_data.data());
|
|
}
|
|
|
|
return wrap(ssbo);
|
|
}
|
|
|
|
void GPU_storagebuf_free(GPUStorageBuf *ssbo)
|
|
{
|
|
delete unwrap(ssbo);
|
|
}
|
|
|
|
void GPU_storagebuf_update(GPUStorageBuf *ssbo, const void *data)
|
|
{
|
|
unwrap(ssbo)->update(data);
|
|
}
|
|
|
|
void GPU_storagebuf_bind(GPUStorageBuf *ssbo, int slot)
|
|
{
|
|
unwrap(ssbo)->bind(slot);
|
|
}
|
|
|
|
void GPU_storagebuf_unbind(GPUStorageBuf *ssbo)
|
|
{
|
|
unwrap(ssbo)->unbind();
|
|
}
|
|
|
|
void GPU_storagebuf_debug_unbind_all()
|
|
{
|
|
Context::get()->debug_unbind_all_ssbo();
|
|
}
|
|
|
|
void GPU_storagebuf_clear_to_zero(GPUStorageBuf *ssbo)
|
|
{
|
|
GPU_storagebuf_clear(ssbo, 0);
|
|
}
|
|
|
|
void GPU_storagebuf_clear(GPUStorageBuf *ssbo, uint32_t clear_value)
|
|
{
|
|
unwrap(ssbo)->clear(clear_value);
|
|
}
|
|
|
|
void GPU_storagebuf_copy_sub_from_vertbuf(GPUStorageBuf *ssbo,
|
|
blender::gpu::VertBuf *src,
|
|
uint dst_offset,
|
|
uint src_offset,
|
|
uint copy_size)
|
|
{
|
|
unwrap(ssbo)->copy_sub(src, dst_offset, src_offset, copy_size);
|
|
}
|
|
|
|
void GPU_storagebuf_sync_to_host(GPUStorageBuf *ssbo)
|
|
{
|
|
unwrap(ssbo)->async_flush_to_host();
|
|
}
|
|
|
|
void GPU_storagebuf_read(GPUStorageBuf *ssbo, void *data)
|
|
{
|
|
unwrap(ssbo)->read(data);
|
|
}
|
|
|
|
void GPU_storagebuf_sync_as_indirect_buffer(GPUStorageBuf *ssbo)
|
|
{
|
|
unwrap(ssbo)->sync_as_indirect_buffer();
|
|
}
|
|
|
|
/** \} */
|