mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
glamor: drop special internal server reset support
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
44620ed67c
commit
5c592210e7
@@ -30,7 +30,6 @@
|
|||||||
#include "glamor_font.h"
|
#include "glamor_font.h"
|
||||||
#include <dixfontstr.h>
|
#include <dixfontstr.h>
|
||||||
|
|
||||||
static x_server_generation_t glamor_font_generation;
|
|
||||||
static int glamor_font_private_index;
|
static int glamor_font_private_index;
|
||||||
static int glamor_font_screen_count;
|
static int glamor_font_screen_count;
|
||||||
|
|
||||||
@@ -218,13 +217,10 @@ glamor_font_init(ScreenPtr screen)
|
|||||||
if (!glamor_glsl_has_ints(glamor_priv))
|
if (!glamor_glsl_has_ints(glamor_priv))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
if (glamor_font_generation != serverGeneration) {
|
glamor_font_private_index = xfont2_allocate_font_private_index();
|
||||||
glamor_font_private_index = xfont2_allocate_font_private_index();
|
if (glamor_font_private_index == -1)
|
||||||
if (glamor_font_private_index == -1)
|
return FALSE;
|
||||||
return FALSE;
|
glamor_font_screen_count = 0;
|
||||||
glamor_font_screen_count = 0;
|
|
||||||
glamor_font_generation = serverGeneration;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (screen->myNum >= glamor_font_screen_count)
|
if (screen->myNum >= glamor_font_screen_count)
|
||||||
glamor_font_screen_count = screen->myNum + 1;
|
glamor_font_screen_count = screen->myNum + 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user