Merge pull request #109 from ZaneA/master

Fix memory leak in demo and example code.
This commit is contained in:
dumblob 2020-04-13 19:18:48 +02:00 committed by GitHub
commit 488580fcb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 17 additions and 1 deletions

View File

@ -161,7 +161,8 @@ nk_d3d11_render(ID3D11DeviceContext *context, enum nk_anti_aliasing AA)
ID3D11DeviceContext_DrawIndexed(context, (UINT)cmd->elem_count, offset, 0);
offset += cmd->elem_count;
}
nk_clear(&d3d11.ctx);}
nk_clear(&d3d11.ctx);
nk_buffer_clear(&d3d11.cmds);}
}
static void

View File

@ -190,6 +190,7 @@ nk_d3d9_render(enum nk_anti_aliasing AA)
}
nk_clear(&d3d9.ctx);
nk_buffer_clear(&d3d9.cmds);
IDirect3DStateBlock9_Apply(d3d9.state);
IDirect3DStateBlock9_Release(d3d9.state);

View File

@ -174,6 +174,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
offset += cmd->elem_count;
}
nk_clear(&glfw.ctx);
nk_buffer_clear(&dev->cmds);
nk_buffer_free(&vbuf);
nk_buffer_free(&ebuf);
}

View File

@ -295,6 +295,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element
offset += cmd->elem_count;
}
nk_clear(&glfw.ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */

View File

@ -446,6 +446,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA)
offset += cmd->elem_count;
}
nk_clear(&glfw.ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */
glUseProgram(0);

View File

@ -154,6 +154,7 @@ nk_sdl_render(enum nk_anti_aliasing AA)
offset += cmd->elem_count;
}
nk_clear(&sdl.ctx);
nk_buffer_clear(&dev->cmds);
nk_buffer_free(&vbuf);
nk_buffer_free(&ebuf);
}

View File

@ -275,6 +275,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
offset += cmd->elem_count;
}
nk_clear(&sdl.ctx);
nk_buffer_clear(&dev->cmds);
}
glUseProgram(0);

View File

@ -276,6 +276,7 @@ nk_sdl_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
offset += cmd->elem_count;
}
nk_clear(&sdl.ctx);
nk_buffer_clear(&dev->cmds);
}
glUseProgram(0);

View File

@ -152,6 +152,7 @@ nk_sfml_render(enum nk_anti_aliasing AA)
offset += cmd->elem_count;
}
nk_clear(&sfml.ctx);
nk_buffer_clear(&dev->cmds);
nk_buffer_free(&vbuf);
nk_buffer_free(&ebuf);
}

View File

@ -279,6 +279,7 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
offset += cmd->elem_count;
}
nk_clear(&sfml.ctx);
nk_buffer_clear(&dev->cmds);
}
glUseProgram(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);

View File

@ -184,6 +184,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
offset += cmd->elem_count;
}
nk_clear(&x11.ctx);
nk_buffer_clear(&dev->cmds);
nk_buffer_free(&vbuf);
nk_buffer_free(&ebuf);
}

View File

@ -566,6 +566,7 @@ nk_x11_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_b
offset += cmd->elem_count;
}
nk_clear(&x11.ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */

View File

@ -293,6 +293,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
offset += cmd->elem_count;
}
nk_clear(ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */

View File

@ -717,6 +717,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
offset += cmd->elem_count;
}
nk_clear(ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */

View File

@ -747,6 +747,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
offset += cmd->elem_count;
}
nk_clear(ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */

View File

@ -317,6 +317,7 @@ device_draw(struct device *dev, struct nk_context *ctx, int width, int height,
offset += cmd->elem_count;
}
nk_clear(ctx);
nk_buffer_clear(&dev->cmds);
}
/* default OpenGL state */