Skip to content

Commit 5c59221

Browse files
committed
glamor: drop special internal server reset support
Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
1 parent 44620ed commit 5c59221

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

glamor/glamor_font.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "glamor_font.h"
3131
#include <dixfontstr.h>
3232

33-
static x_server_generation_t glamor_font_generation;
3433
static int glamor_font_private_index;
3534
static int glamor_font_screen_count;
3635

@@ -218,13 +217,10 @@ glamor_font_init(ScreenPtr screen)
218217
if (!glamor_glsl_has_ints(glamor_priv))
219218
return TRUE;
220219

221-
if (glamor_font_generation != serverGeneration) {
222-
glamor_font_private_index = xfont2_allocate_font_private_index();
223-
if (glamor_font_private_index == -1)
224-
return FALSE;
225-
glamor_font_screen_count = 0;
226-
glamor_font_generation = serverGeneration;
227-
}
220+
glamor_font_private_index = xfont2_allocate_font_private_index();
221+
if (glamor_font_private_index == -1)
222+
return FALSE;
223+
glamor_font_screen_count = 0;
228224

229225
if (screen->myNum >= glamor_font_screen_count)
230226
glamor_font_screen_count = screen->myNum + 1;

0 commit comments

Comments
 (0)