From c86cb51bf6256d7f9040cc1c8a498e3cf3764fe2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 1 Apr 2026 23:25:48 -0600 Subject: [PATCH] [gpu] Fix garbled rendering after font change in web demo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GL renderer cached the vertex buffer upload by comparing the data pointer and count. After clearing and refilling the buffer with a new font's glyphs, std::vector reused the same allocation, so the pointer and count matched — the upload was skipped and the GPU drew with stale vertex data containing old atlas offsets. Fix by adding a generation counter to demo_buffer_t that increments on clear(). The renderer compares generation and count to decide whether to re-upload. Assisted-by: Claude --- util/gpu/demo-buffer.cc | 8 ++++++++ util/gpu/demo-buffer.h | 3 +++ util/gpu/demo-metal.mm | 1 + util/gpu/demo-renderer-d3d11.cc | 1 + util/gpu/demo-renderer-gl.cc | 9 +++++---- util/gpu/demo-renderer.h | 3 ++- util/gpu/web/hb-gpu-web-webgpu.cc | 1 + 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/util/gpu/demo-buffer.cc b/util/gpu/demo-buffer.cc index dee2fe46c..c12f403a8 100644 --- a/util/gpu/demo-buffer.cc +++ b/util/gpu/demo-buffer.cc @@ -10,6 +10,7 @@ struct demo_buffer_t { std::vector *vertices; demo_extents_t ink_extents; demo_extents_t logical_extents; + unsigned generation; }; demo_buffer_t * @@ -41,6 +42,7 @@ demo_buffer_clear (demo_buffer_t *buffer) buffer->vertices->clear (); demo_extents_clear (&buffer->ink_extents); demo_extents_clear (&buffer->logical_extents); + buffer->generation++; } void @@ -173,3 +175,9 @@ demo_buffer_get_vertices (demo_buffer_t *buffer, return nullptr; return &(*buffer->vertices)[0]; } + +unsigned +demo_buffer_get_generation (demo_buffer_t *buffer) +{ + return buffer->generation; +} diff --git a/util/gpu/demo-buffer.h b/util/gpu/demo-buffer.h index 4e1d8eaa5..77603a943 100644 --- a/util/gpu/demo-buffer.h +++ b/util/gpu/demo-buffer.h @@ -55,5 +55,8 @@ glyph_vertex_t * demo_buffer_get_vertices (demo_buffer_t *buffer, unsigned int *count); +unsigned +demo_buffer_get_generation (demo_buffer_t *buffer); + #endif /* DEMO_BUFFER_H */ diff --git a/util/gpu/demo-metal.mm b/util/gpu/demo-metal.mm index fdf47a263..d54d5a4be 100644 --- a/util/gpu/demo-metal.mm +++ b/util/gpu/demo-metal.mm @@ -251,6 +251,7 @@ struct demo_renderer_metal_t : demo_renderer_t /* -- Frame -- */ void display (glyph_vertex_t *vertices, unsigned int count, + unsigned generation HB_UNUSED, int width, int height, float mat[16]) override { @autoreleasepool { diff --git a/util/gpu/demo-renderer-d3d11.cc b/util/gpu/demo-renderer-d3d11.cc index 79a52cf4a..5b4cfc1e2 100644 --- a/util/gpu/demo-renderer-d3d11.cc +++ b/util/gpu/demo-renderer-d3d11.cc @@ -275,6 +275,7 @@ float4 ps_main (PSInput input) : SV_Target { void toggle_vsync (bool &v) override { v = !v; vsync_on = v; } void display (glyph_vertex_t *vertices, unsigned count, + unsigned generation HB_UNUSED, int width, int height, float mat[16]) override { if (width != cur_width || height != cur_height) diff --git a/util/gpu/demo-renderer-gl.cc b/util/gpu/demo-renderer-gl.cc index eb8785f7a..8baa7f83e 100644 --- a/util/gpu/demo-renderer-gl.cc +++ b/util/gpu/demo-renderer-gl.cc @@ -15,11 +15,11 @@ struct demo_renderer_gl_t : demo_renderer_t GLuint buf_name; bool vao_ready; unsigned int uploaded_count; - glyph_vertex_t *uploaded_ptr; + unsigned uploaded_generation; demo_renderer_gl_t (GLFWwindow *window_) : window (window_), vao_ready (false), - uploaded_count (0), uploaded_ptr (nullptr) + uploaded_count (0), uploaded_generation (0) { st = demo_glstate_create (); glGenVertexArrays (1, &vao_name); @@ -137,6 +137,7 @@ struct demo_renderer_gl_t : demo_renderer_t } void display (glyph_vertex_t *vertices, unsigned int count, + unsigned generation, int width, int height, float mat[16]) override { glViewport (0, 0, width, height); @@ -150,14 +151,14 @@ struct demo_renderer_gl_t : demo_renderer_t glBindVertexArray (vao_name); - if (vertices != uploaded_ptr || count != uploaded_count) + if (count != uploaded_count || generation != uploaded_generation) { glBindBuffer (GL_ARRAY_BUFFER, buf_name); glBufferData (GL_ARRAY_BUFFER, sizeof (glyph_vertex_t) * count, (const char *) vertices, GL_STATIC_DRAW); - uploaded_ptr = vertices; uploaded_count = count; + uploaded_generation = generation; } glDrawArrays (GL_TRIANGLES, 0, count); diff --git a/util/gpu/demo-renderer.h b/util/gpu/demo-renderer.h index 3419dc4af..889457082 100644 --- a/util/gpu/demo-renderer.h +++ b/util/gpu/demo-renderer.h @@ -34,8 +34,9 @@ struct demo_renderer_t /* Vsync toggle. */ virtual void toggle_vsync (bool &vsync) = 0; - /* Render a frame. */ + /* Render a frame. generation changes when buffer content is rebuilt. */ virtual void display (glyph_vertex_t *vertices, unsigned int count, + unsigned generation, int width, int height, float mat[16]) = 0; }; diff --git a/util/gpu/web/hb-gpu-web-webgpu.cc b/util/gpu/web/hb-gpu-web-webgpu.cc index 31daf749a..5bd4adf25 100644 --- a/util/gpu/web/hb-gpu-web-webgpu.cc +++ b/util/gpu/web/hb-gpu-web-webgpu.cc @@ -244,6 +244,7 @@ struct demo_renderer_webgpu_t : demo_renderer_t void toggle_vsync (bool &vsync) override { /* always vsync in browser */ } void display (glyph_vertex_t *vertices, unsigned int count, + unsigned generation HB_UNUSED, int width, int height, float mat[16]) override { WGPUSurfaceTexture surfTex;