mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-23 23:15:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81036 from jsjtxietian/fix_RasterizerCanvasGLES3_add_to_batch_crash

Browse Source 
GLES3: Fix `glMapBufferRange` return null when `r_index + last_item_index > max_instance`
This commit is contained in:
Rémi Verschelde 2023-08-28 12:09:24 +02:00
commit 5491dcd387
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -1451,7 +1451,7 @@ void RasterizerCanvasGLES3::_render_batch(Light *p_lights, uint32_t p_index) {
void RasterizerCanvasGLES3::_add_to_batch(uint32_t &r_index, bool &r_batch_broken) { void RasterizerCanvasGLES3::_add_to_batch(uint32_t &r_index, bool &r_batch_broken) {
state.canvas_instance_batches[state.current_batch_index].instance_count++; state.canvas_instance_batches[state.current_batch_index].instance_count++;
r_index++; r_index++;
if (r_index >= data.max_instances_per_buffer) { if (r_index + state.last_item_index >= data.max_instances_per_buffer) {
// Copy over all data needed for rendering right away // Copy over all data needed for rendering right away
// then go back to recording item commands. // then go back to recording item commands.
glBindBuffer(GL_ARRAY_BUFFER, state.canvas_instance_data_buffers[state.current_data_buffer_index].instance_buffers[state.current_instance_buffer_index]); glBindBuffer(GL_ARRAY_BUFFER, state.canvas_instance_data_buffers[state.current_data_buffer_index].instance_buffers[state.current_instance_buffer_index]);