Mercurial > repos > blastem

comparison nuklear_ui/nuklear_sdl_gles2.h @ 2249:1838b0b8f4ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix use of variable after it left scope bug identified by asan
author Michael Pavone <pavone@retrodev.com>
date Thu, 24 Nov 2022 01:22:58 -0800
parents 0757da8ee702
children b7768c58f0da
comparison
equal deleted inserted replaced
2248:f7e2e11f1214 2249:1838b0b8f4ff
249 glBufferData(GL_ELEMENT_ARRAY_BUFFER, max_element_buffer, NULL, GL_STREAM_DRAW); 249 glBufferData(GL_ELEMENT_ARRAY_BUFFER, max_element_buffer, NULL, GL_STREAM_DRAW);
250 250
251 /* load vertices/elements directly into vertex/element buffer */ 251 /* load vertices/elements directly into vertex/element buffer */
252 vertices = malloc((size_t)max_vertex_buffer); 252 vertices = malloc((size_t)max_vertex_buffer);
253 elements = malloc((size_t)max_element_buffer); 253 elements = malloc((size_t)max_element_buffer);
254 struct nk_buffer vbuf, ebuf;
254 { 255 {
255 /* fill convert configuration */ 256 /* fill convert configuration */
256 struct nk_convert_config config; 257 struct nk_convert_config config;
257 static const struct nk_draw_vertex_layout_element vertex_layout[] = { 258 static const struct nk_draw_vertex_layout_element vertex_layout[] = {
258 {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sdl_vertex, position)}, 259 {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sdl_vertex, position)},
271 config.global_alpha = 1.0f; 272 config.global_alpha = 1.0f;
272 config.shape_AA = AA; 273 config.shape_AA = AA;
273 config.line_AA = AA; 274 config.line_AA = AA;
274 275
275 /* setup buffers to load vertices and elements */ 276 /* setup buffers to load vertices and elements */
276 {struct nk_buffer vbuf, ebuf;
277 nk_buffer_init_fixed(&vbuf, vertices, (nk_size)max_vertex_buffer); 277 nk_buffer_init_fixed(&vbuf, vertices, (nk_size)max_vertex_buffer);
278 nk_buffer_init_fixed(&ebuf, elements, (nk_size)max_element_buffer); 278 nk_buffer_init_fixed(&ebuf, elements, (nk_size)max_element_buffer);
279 nk_convert(&sdl.ctx, &dev->cmds, &vbuf, &ebuf, &config);} 279 nk_convert(&sdl.ctx, &dev->cmds, &vbuf, &ebuf, &config);
280 } 280 }
281 glBufferSubData(GL_ARRAY_BUFFER, 0, (size_t)max_vertex_buffer, vertices); 281 glBufferSubData(GL_ARRAY_BUFFER, 0, (size_t)max_vertex_buffer, vertices);
282 glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, (size_t)max_element_buffer, elements); 282 glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, (size_t)max_element_buffer, elements);
283 free(vertices); 283 free(vertices);
284 free(elements); 284 free(elements);