Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.92-release'

Browse Source
This commit is contained in:
Clément Foucault
2021-02-01 13:41:21 +01:00
parent 5c72a4d452 03c1c5f3a4
commit f04ddd398f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/gpu/opengl/gl_drawlist.cc
View File

@@ -69,7 +69,6 @@ GLDrawList::GLDrawList(int length)
buffer_id_ = 0;
command_len_ = 0;
command_offset_ = 0;
data_offset_ = 0;
data_size_ = 0;
data_ = nullptr;
@@ -81,6 +80,8 @@ GLDrawList::GLDrawList(int length)
/* Indicates MDI is not supported. */
buffer_size_ = 0;
}
/* Force buffer specification on first init. */
data_offset_ = buffer_size_;
}
GLDrawList::~GLDrawList()
@@ -104,10 +105,10 @@ void GLDrawList::init()
glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer_id_);
/* If buffer is full, orphan buffer data and start fresh. */
// if (command_offset_ >= data_size_) {
glBufferData(GL_DRAW_INDIRECT_BUFFER, buffer_size_, nullptr, GL_DYNAMIC_DRAW);
data_offset_ = 0;
// }
if (data_offset_ >= buffer_size_) {
glBufferData(GL_DRAW_INDIRECT_BUFFER, buffer_size_, nullptr, GL_DYNAMIC_DRAW);
data_offset_ = 0;
}
/* Map the remaining range. */
GLbitfield flag = GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | GL_MAP_FLUSH_EXPLICIT_BIT;
data_size_ = buffer_size_ - data_offset_;