|
14 | 14 |
|
15 | 15 | // CHANGELOG
|
16 | 16 | // (minor and older changes stripped away, please see git history for details)
|
| 17 | +// 2022-05-23: OpenGL: Reworking 2021-12-15 "Using buffer orphaning" so it only happens on Intel GPU, seems to cause problems otherwise. (#4468, #4825, #4832, #5127). |
17 | 18 | // 2022-05-13: OpenGL: Fix state corruption on OpenGL ES 2.0 due to not preserving GL_ELEMENT_ARRAY_BUFFER_BINDING and vertex attribute states.
|
18 | 19 | // 2021-12-15: OpenGL: Using buffer orphaning + glBufferSubData(), seems to fix leaks with multi-viewports with some Intel HD drivers.
|
19 | 20 | // 2021-08-23: OpenGL: Fixed ES 3.0 shader ("#version 300 es") use normal precision floats to avoid wobbly rendering at HD resolutions.
|
@@ -193,6 +194,7 @@ struct ImGui_ImplOpenGL3_Data
|
193 | 194 | GLsizeiptr VertexBufferSize;
|
194 | 195 | GLsizeiptr IndexBufferSize;
|
195 | 196 | bool HasClipOrigin;
|
| 197 | + bool UseBufferSubData; |
196 | 198 |
|
197 | 199 | ImGui_ImplOpenGL3_Data() { memset((void*)this, 0, sizeof(*this)); }
|
198 | 200 | };
|
@@ -261,6 +263,14 @@ bool ImGui_ImplOpenGL3_Init(const char* glsl_version)
|
261 | 263 | sscanf(gl_version, "%d.%d", &major, &minor);
|
262 | 264 | }
|
263 | 265 | bd->GlVersion = (GLuint)(major * 100 + minor * 10);
|
| 266 | + |
| 267 | + // Query vendor to enable glBufferSubData kludge |
| 268 | +#ifdef _WIN32 |
| 269 | + if (const char* vendor = (const char*)glGetString(GL_VENDOR)) |
| 270 | + if (strncmp(vendor, "Intel", 5) == 0) |
| 271 | + bd->UseBufferSubData = true; |
| 272 | +#endif |
| 273 | + //printf("GL_MAJOR_VERSION = %d\nGL_MINOR_VERSION = %d\nGL_VENDOR = '%s'\nGL_RENDERER = '%s'\n", major, minor, (const char*)glGetString(GL_VENDOR), (const char*)glGetString(GL_RENDERER)); // [DEBUG] |
264 | 274 | #else
|
265 | 275 | bd->GlVersion = 200; // GLES 2
|
266 | 276 | #endif
|
@@ -474,20 +484,31 @@ void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data)
|
474 | 484 | const ImDrawList* cmd_list = draw_data->CmdLists[n];
|
475 | 485 |
|
476 | 486 | // Upload vertex/index buffers
|
477 |
| - GLsizeiptr vtx_buffer_size = (GLsizeiptr)cmd_list->VtxBuffer.Size * (int)sizeof(ImDrawVert); |
478 |
| - GLsizeiptr idx_buffer_size = (GLsizeiptr)cmd_list->IdxBuffer.Size * (int)sizeof(ImDrawIdx); |
479 |
| - if (bd->VertexBufferSize < vtx_buffer_size) |
| 487 | + // - On Intel windows drivers we got reports that regular glBufferData() led to accumulating leaks when using multi-viewports, so we started using orphaning + glBufferSubData(). (See https://github.com/ocornut/imgui/issues/4468) |
| 488 | + // - On NVIDIA drivers we got reports that using orphaning + glBufferSubData() led to glitches when using multi-viewports. |
| 489 | + // - OpenGL drivers are in a very sorry state in 2022, for now we are switching code path based on vendors. |
| 490 | + const GLsizeiptr vtx_buffer_size = (GLsizeiptr)cmd_list->VtxBuffer.Size * (int)sizeof(ImDrawVert); |
| 491 | + const GLsizeiptr idx_buffer_size = (GLsizeiptr)cmd_list->IdxBuffer.Size * (int)sizeof(ImDrawIdx); |
| 492 | + if (bd->UseBufferSubData) |
480 | 493 | {
|
481 |
| - bd->VertexBufferSize = vtx_buffer_size; |
482 |
| - glBufferData(GL_ARRAY_BUFFER, bd->VertexBufferSize, NULL, GL_STREAM_DRAW); |
| 494 | + if (bd->VertexBufferSize < vtx_buffer_size) |
| 495 | + { |
| 496 | + bd->VertexBufferSize = vtx_buffer_size; |
| 497 | + glBufferData(GL_ARRAY_BUFFER, bd->VertexBufferSize, NULL, GL_STREAM_DRAW); |
| 498 | + } |
| 499 | + if (bd->IndexBufferSize < idx_buffer_size) |
| 500 | + { |
| 501 | + bd->IndexBufferSize = idx_buffer_size; |
| 502 | + glBufferData(GL_ELEMENT_ARRAY_BUFFER, bd->IndexBufferSize, NULL, GL_STREAM_DRAW); |
| 503 | + } |
| 504 | + glBufferSubData(GL_ARRAY_BUFFER, 0, vtx_buffer_size, (const GLvoid*)cmd_list->VtxBuffer.Data); |
| 505 | + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, idx_buffer_size, (const GLvoid*)cmd_list->IdxBuffer.Data); |
483 | 506 | }
|
484 |
| - if (bd->IndexBufferSize < idx_buffer_size) |
| 507 | + else |
485 | 508 | {
|
486 |
| - bd->IndexBufferSize = idx_buffer_size; |
487 |
| - glBufferData(GL_ELEMENT_ARRAY_BUFFER, bd->IndexBufferSize, NULL, GL_STREAM_DRAW); |
| 509 | + glBufferData(GL_ARRAY_BUFFER, vtx_buffer_size, (const GLvoid*)cmd_list->VtxBuffer.Data, GL_STREAM_DRAW); |
| 510 | + glBufferData(GL_ELEMENT_ARRAY_BUFFER, idx_buffer_size, (const GLvoid*)cmd_list->IdxBuffer.Data, GL_STREAM_DRAW); |
488 | 511 | }
|
489 |
| - glBufferSubData(GL_ARRAY_BUFFER, 0, vtx_buffer_size, (const GLvoid*)cmd_list->VtxBuffer.Data); |
490 |
| - glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, idx_buffer_size, (const GLvoid*)cmd_list->IdxBuffer.Data); |
491 | 512 |
|
492 | 513 | for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
|
493 | 514 | {
|
|
0 commit comments