fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-13 15:18:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/glamor-cleanup' into 'main'

Browse source 
glamor: fix an error path cleanup

See merge request xorg/xserver!2233
This commit is contained in:
Peter Hutterer 2026-06-05 13:50:46 +10:00
commit 1b820533dc
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
glamor/glamor_font.c
View file

@ -160,11 +160,14 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8UI, overall_width, overall_height,
0, GL_RED_INTEGER, GL_UNSIGNED_BYTE, bits);
glamor_priv->suppress_gl_out_of_memory_logging = false;
if (glGetError() == GL_OUT_OF_MEMORY)
return NULL;
free(bits);
if (glGetError() == GL_OUT_OF_MEMORY) {
glDeleteTextures(1, &glamor_font->texture_id);
glamor_font->texture_id = 0;
return NULL;
}
glamor_font->realized = TRUE;
return glamor_font;