diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-12-04 12:29:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-04 12:29:50 +0100 |
| commit | 73fb08289af1260669a3ce118b9866a11c06a0eb (patch) | |
| tree | 4bc32d6ea0bdf5ad5c7bbf8d302ac63d5b304e3e | |
| parent | e1dda5195cb2b8620a61740e8491cbb243aa653c (diff) | |
| parent | 745a8915fc5ef0e98c97623cef2792eb95f9aa2b (diff) | |
Merge pull request #34099 from akien-mga/gles3-polygon-buffer-orphaning-fix-2
Properly orphan polygon index buffer after binding (take 2)
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 981b9a3576..b3263ce41c 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -479,9 +479,8 @@ void RasterizerCanvasGLES3::_draw_generic_indices(GLuint p_primitive, const int glBindBuffer(GL_ARRAY_BUFFER, data.polygon_buffer); #ifndef GLES_OVER_GL - // Orphan the buffers to avoid CPU/GPU sync points caused by glBufferSubData + // Orphan the buffer to avoid CPU/GPU sync points caused by glBufferSubData glBufferData(GL_ARRAY_BUFFER, data.polygon_buffer_size, NULL, GL_DYNAMIC_DRAW); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, data.polygon_index_buffer_size, NULL, GL_DYNAMIC_DRAW); #endif uint32_t buffer_ofs = 0; @@ -532,6 +531,10 @@ void RasterizerCanvasGLES3::_draw_generic_indices(GLuint p_primitive, const int //bind the indices buffer. glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, data.polygon_index_buffer); +#ifndef GLES_OVER_GL + // Orphan the buffer to avoid CPU/GPU sync points caused by glBufferSubData + glBufferData(GL_ELEMENT_ARRAY_BUFFER, data.polygon_index_buffer_size, NULL, GL_DYNAMIC_DRAW); +#endif glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, sizeof(int) * p_index_count, p_indices); //draw the triangles. |