fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-09 07:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "glamor: add glvnd_vendor private"

Browse source 
This reverts commit a6145198bc.

We no longer need to store the glvnd vendor, so we can also drop that
change.

See-also: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1848
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2104>
This commit is contained in:
Olivier Fourdan 2025-11-19 16:24:19 +01:00
parent 399177dc8c
commit 75d6e5d20b
4 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
glamor/glamor.c
View file

@ -941,7 +941,6 @@ glamor_close_screen(ScreenPtr screen)
glamor_priv = glamor_get_screen_private(screen);
glamor_sync_close(screen);
glamor_composite_glyphs_fini(screen);
glamor_set_glvnd_vendor(screen, NULL);
screen->CloseScreen = glamor_priv->saved_procs.close_screen;
screen->CreateGC = glamor_priv->saved_procs.create_gc;
@ -974,31 +973,6 @@ glamor_fini(ScreenPtr screen)
/* Do nothing currently. */
}
void
glamor_set_glvnd_vendor(ScreenPtr screen, const char *vendor_name)
{
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
if (!glamor_priv)
return;
if (glamor_priv->glvnd_vendor)
free(glamor_priv->glvnd_vendor);
glamor_priv->glvnd_vendor = xnfstrdup(vendor_name);
}
const char *
glamor_get_glvnd_vendor(ScreenPtr screen)
{
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
if (!glamor_priv)
return NULL;
return glamor_priv->glvnd_vendor;
}
void
glamor_enable_dri3(ScreenPtr screen)
{

6
glamor/glamor.h
View file

@ -120,12 +120,6 @@ extern _X_EXPORT void glamor_clear_pixmap(PixmapPtr pixmap);
extern _X_EXPORT void glamor_block_handler(ScreenPtr screen);
/* This function should be called after glamor_init,
* but before adding a glamor GLX provider */
extern _X_EXPORT void glamor_set_glvnd_vendor(ScreenPtr screen,
const char *vendor);
extern _X_EXPORT const char *glamor_get_glvnd_vendor(ScreenPtr screen);
extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
int depth, unsigned int usage);
extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap);

5
glamor/glamor_egl.c
View file

@ -896,7 +896,6 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
#ifdef DRI3
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
#endif
const char *gbm_backend_name;
glamor_egl->saved_close_screen = screen->CloseScreen;
screen->CloseScreen = glamor_egl_close_screen;
@ -909,10 +908,6 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
glamor_ctx->make_current = glamor_egl_make_current;
gbm_backend_name = gbm_device_get_backend_name(glamor_egl->gbm);
/* Mesa uses "drm" as backend name, in that case, just do nothing */
if (gbm_backend_name && strcmp(gbm_backend_name, "drm") != 0)
glamor_set_glvnd_vendor(screen, gbm_backend_name);
#ifdef DRI3
/* Tell the core that we have the interfaces for import/export
* of pixmaps.

1
glamor/glamor_priv.h
View file

@ -336,7 +336,6 @@ typedef struct glamor_screen_private {
int flags;
ScreenPtr screen;
int dri3_enabled;
char *glvnd_vendor;
Bool suppress_gl_out_of_memory_logging;
Bool logged_any_fbo_allocation_failure;