archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPU: Fix issue with MDI and recent refactor

Browse Source
This commit is contained in:
Clément Foucault
2020-08-13 14:17:03 +02:00
parent f349ea5508
commit d52f28380b
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

@@ -185,7 +185,8 @@ void GLDrawList::submit(void)
BLI_assert(MDI_ENABLED);
BLI_assert(data_);
BLI_assert(GPU_context_active_get()->shader != NULL);
/* TODO could assert that VAO is bound. */
GLBatch *batch = static_cast<GLBatch *>(batch_);
/* Only do multi-draw indirect if doing more than 2 drawcall. This avoids the overhead of
* buffer mapping if scene is not very instance friendly. BUT we also need to take into
@@ -202,7 +203,7 @@ void GLDrawList::submit(void)
data_ = NULL; /* Unmapped */
data_offset_ += command_offset_;
static_cast<GLBatch *>(batch_)->bind(0);
batch->bind(0);
if (MDI_INDEXED) {
glMultiDrawElementsIndirect(prim, INDEX_TYPE(batch_->elem), offset, command_len_, 0);
@@ -217,8 +218,8 @@ void GLDrawList::submit(void)
GLDrawCommandIndexed *cmd = (GLDrawCommandIndexed *)data_;
for (int i = 0; i < command_len_; i++, cmd++) {
/* Index start was already added. Avoid counting it twice. */
cmd->v_first -= batch_->elem->index_start;
GPU_batch_draw_advanced(batch_, cmd->v_first, cmd->v_count, cmd->i_first, cmd->i_count);
cmd->v_first -= batch->elem->index_start;
batch->draw(cmd->v_first, cmd->v_count, cmd->i_first, cmd->i_count);
}
/* Reuse the same data. */
command_offset_ -= command_len_ * sizeof(GLDrawCommandIndexed);
@@ -226,7 +227,7 @@ void GLDrawList::submit(void)
else {
GLDrawCommand *cmd = (GLDrawCommand *)data_;
for (int i = 0; i < command_len_; i++, cmd++) {
GPU_batch_draw_advanced(batch_, cmd->v_first, cmd->v_count, cmd->i_first, cmd->i_count);
batch->draw(cmd->v_first, cmd->v_count, cmd->i_first, cmd->i_count);
}
/* Reuse the same data. */
command_offset_ -= command_len_ * sizeof(GLDrawCommand);