TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: pad SSBOs to 16 byte boundary (required by some drivers)

Browse Source
This commit is contained in:
rdb 2018-07-17 22:55:35 +02:00
parent 06539f5c66
commit b5194d9ff2
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -6404,7 +6404,8 @@ prepare_shader_buffer(ShaderBuffer *data) {
_glObjectLabel(GL_SHADER_STORAGE_BUFFER, gbc->_index, name.size(), name.data()); _glObjectLabel(GL_SHADER_STORAGE_BUFFER, gbc->_index, name.size(), name.data());
} }
uint64_t num_bytes = data->get_data_size_bytes(); // Some drivers require the buffer to be padded to 16 byte boundary.
uint64_t num_bytes = (data->get_data_size_bytes() + 15u) & ~15u;
if (_supports_buffer_storage) { if (_supports_buffer_storage) {
_glBufferStorage(GL_SHADER_STORAGE_BUFFER, num_bytes, data->get_initial_data(), 0); _glBufferStorage(GL_SHADER_STORAGE_BUFFER, num_bytes, data->get_initial_data(), 0);
} else { } else {

12
panda/src/gobj/shaderBuffer.I
View File

@ -19,8 +19,7 @@ INLINE ShaderBuffer::
ShaderBuffer(const std::string &name, uint64_t size, UsageHint usage_hint) : ShaderBuffer(const std::string &name, uint64_t size, UsageHint usage_hint) :
Namable(name), Namable(name),
_data_size_bytes(size), _data_size_bytes(size),
_usage_hint(usage_hint), _usage_hint(usage_hint) {
_contexts(nullptr) {
} }
/** /**
@ -32,8 +31,13 @@ ShaderBuffer(const std::string &name, vector_uchar initial_data, UsageHint usage
Namable(name), Namable(name),
_data_size_bytes(initial_data.size()), _data_size_bytes(initial_data.size()),
_usage_hint(usage_hint), _usage_hint(usage_hint),
_initial_data(initial_data), _initial_data(std::move(initial_data)) {
_contexts(nullptr) {
// Make sure it is padded to 16 bytes. Some drivers like that.
if ((_initial_data.size() & 15u) != 0) {
_initial_data.resize((_initial_data.size() + 15u) & ~15u, 0);
_data_size_bytes = _initial_data.size();
}
} }
/** /**

2
panda/src/gobj/shaderBuffer.cxx
View File

@ -193,7 +193,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
if (scan.get_bool() && _data_size_bytes > 0) { if (scan.get_bool() && _data_size_bytes > 0) {
nassertv_always(_data_size_bytes <= scan.get_remaining_size()); nassertv_always(_data_size_bytes <= scan.get_remaining_size());
_initial_data.resize(_data_size_bytes); _initial_data.resize((_data_size_bytes + 15u) & ~15u);
scan.extract_bytes(&_initial_data[0], _data_size_bytes); scan.extract_bytes(&_initial_data[0], _data_size_bytes);
} else { } else {
_initial_data.clear(); _initial_data.clear();

2
panda/src/gobj/shaderBuffer.h
View File

@ -63,7 +63,7 @@ private:
vector_uchar _initial_data; vector_uchar _initial_data;
typedef pmap<PreparedGraphicsObjects *, BufferContext *> Contexts; typedef pmap<PreparedGraphicsObjects *, BufferContext *> Contexts;
Contexts *_contexts; Contexts *_contexts = nullptr;
public: public:
static void register_with_read_factory(); static void register_with_read_factory();