Skip to content

glx: Use basil for DRI3 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
notbabaisyou wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

glx: Use basil for DRI3 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ac53c
glx: Add basil provider
notbabaisyou Apr 29, 2026
e8fc814
glamor: Remove GLXGlamor
notbabaisyou Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions glamor/glamor_egl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@

#include "glamor.h"
#include "glamor_priv.h"
#include "glxglamor.h"
#include "dri3.h"

/*
Expand All @@ -72,7 +71,6 @@ struct glamor_egl_screen_private {

Bool dmabuf_capable;
Bool high_priority_ctx;
Bool provider_enabled; /* if GLX provider is enabled in options */

/* Misc. items, least used. */

Expand Down Expand Up @@ -1037,7 +1035,6 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
#endif
#ifdef GLXEXT
static Bool vendor_initialized = FALSE;
const char *gbm_backend_name;
#endif

Expand Down Expand Up @@ -1085,14 +1082,6 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
}
}
#endif

#ifdef GLXEXT
if (glamor_egl->provider_enabled && !vendor_initialized) {
GlxPushProvider(&glamor_provider);
xorgGlxCreateVendor();
vendor_initialized = TRUE;
}
#endif
}

static void glamor_egl_cleanup(struct glamor_egl_screen_private *glamor_egl)
Expand Down Expand Up @@ -1255,12 +1244,10 @@ glamor_egl_try_gles_api(ScrnInfoPtr scrn)

enum {
GLAMOREGLOPT_RENDERING_API,
GLAMOREGLOPT_GLX_GLAMOR,
};

static const OptionInfoRec GlamorEGLOptions[] = {
{ GLAMOREGLOPT_RENDERING_API, "RenderingAPI", OPTV_STRING, {0}, FALSE },
{ GLAMOREGLOPT_GLX_GLAMOR, "GLXGlamor", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE },
};

Expand All @@ -1284,9 +1271,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
memcpy(options, GlamorEGLOptions, sizeof(GlamorEGLOptions));
xf86ProcessOptions(scrn->scrnIndex, scrn->options, options);

glamor_egl->provider_enabled =
xf86ReturnOptValBool(options, GLAMOREGLOPT_GLX_GLAMOR, TRUE);

api = xf86GetOptValString(options, GLAMOREGLOPT_RENDERING_API);
if (api && !strncasecmp(api, "es", 2))
force_es = TRUE;
Expand Down
Loading