XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

glamor/glamor_egl.c: Split glamor_egl_init into generic and xf86 parts

Browse Source 
Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-03-19 00:30:04 +02:00
committed by Enrico Weigelt
parent b76d18bf9b
commit 36d80785ab
2 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
glamor/glamor_egl.c
View File

@@ -76,6 +76,7 @@ glamor_xf86_egl_free_screen(ScrnInfoPtr scrn)
if (glamor_egl != NULL) {
scrn->FreeScreen = glamor_egl->saved_free_screen;
glamor_egl_cleanup(glamor_egl);
free(glamor_egl);
scrn->FreeScreen(scrn);
}
}
@@ -1143,6 +1144,10 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
static void glamor_egl_cleanup(glamor_egl_priv_t *glamor_egl)
{
if (!glamor_egl) {
return;
}
if (glamor_egl->display != EGL_NO_DISPLAY) {
eglMakeCurrent(glamor_egl->display,
EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
@@ -1157,7 +1162,6 @@ static void glamor_egl_cleanup(glamor_egl_priv_t *glamor_egl)
gbm_device_destroy(glamor_egl->gbm);
free(glamor_egl->device_path);
free(glamor_egl->glvnd_vendor);
free(glamor_egl);
}
static Bool
@@ -1254,46 +1258,15 @@ static const OptionInfoRec GlamorEGLOptions[] = {
};
Bool
glamor_egl_init(ScrnInfoPtr scrn, int fd)
glamor_egl_init2(glamor_egl_priv_t* glamor_egl)
{
glamor_egl_priv_t *glamor_egl;
const GLubyte *renderer;
OptionInfoPtr options;
const char *api = NULL;
Bool es_allowed = TRUE;
Bool force_es = FALSE;
const char *glvnd_vendor = NULL;
glamor_egl = calloc(1, sizeof(*glamor_egl));
if (glamor_egl == NULL)
return FALSE;
if (xf86GlamorEGLPrivateIndex == -1)
xf86GlamorEGLPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
glamor_egl_get_screen_private = glamor_egl->GLAMOR_EGL_PRIV_PROC;
options = XNFalloc(sizeof(GlamorEGLOptions));
memcpy(options, GlamorEGLOptions, sizeof(GlamorEGLOptions));
xf86ProcessOptions(scrn->scrnIndex, scrn->options, options);
glvnd_vendor = xf86GetOptValString(options, GLAMOREGLOPT_VENDOR_LIBRARY);
if (glvnd_vendor) {
glamor_egl->glvnd_vendor = strdup(glvnd_vendor);
if (!glamor_egl->glvnd_vendor) {
LogMessage(X_WARNING, "Couldn't set gl vendor to: %s\n", glvnd_vendor);
}
}
api = xf86GetOptValString(options, GLAMOREGLOPT_RENDERING_API);
if (api && !strncasecmp(api, "es", 2))
force_es = TRUE;
else if (api && !strncasecmp(api, "gl", 2))
es_allowed = FALSE;
free(options);
glamor_egl_get_screen_private = glamor_xf86_egl_get_screen_private;
scrn->privates[xf86GlamorEGLPrivateIndex].ptr = glamor_egl;
glamor_egl->fd = fd;
glamor_egl->gbm = gbm_create_device(glamor_egl->fd);
if (glamor_egl->gbm == NULL) {
ErrorF("couldn't get display device\n");
ErrorF("couldn't create gbm device\n");
goto error;
}
@@ -1326,12 +1299,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
GLAMOR_CHECK_EGL_EXTENSION(KHR_surfaceless_context);
GLAMOR_CHECK_EGL_EXTENSION(KHR_no_config_context);
if (!force_es) {
if (!glamor_egl->force_es) {
if(!glamor_egl_try_big_gl_api(glamor_egl))
goto error;
}
if (glamor_egl->context == EGL_NO_CONTEXT && es_allowed) {
if (glamor_egl->context == EGL_NO_CONTEXT && !glamor_egl->es_disallowed) {
if(!glamor_egl_try_gles_api(glamor_egl))
goto error;
}
@@ -1354,7 +1327,7 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
goto error;
}
if (!strncmp("llvmpipe", (const char *)renderer, strlen("llvmpipe"))) {
if (scrn->confScreen->num_gpu_devices)
if (glamor_egl->llvmpipe_allowed)
LogMessage(X_INFO,
"Allowing glamor on llvmpipe for PRIME\n");
else {
@@ -1400,9 +1373,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
}
#endif
glamor_egl->saved_free_screen = scrn->FreeScreen;
scrn->FreeScreen = glamor_xf86_egl_free_screen;
/* Check if at least one combination of format + modifier is supported */
CARD32 *formats = NULL;
CARD32 num_formats = 0;
@@ -1436,13 +1406,57 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
return TRUE;
error:
if (glamor_egl->saved_free_screen) {
scrn->FreeScreen = glamor_egl->saved_free_screen;
}
glamor_egl_cleanup(glamor_egl);
return FALSE;
}
Bool
glamor_egl_init(ScrnInfoPtr scrn, int fd)
{
glamor_egl_priv_t *glamor_egl;
OptionInfoPtr options;
const char *api = NULL;
const char *glvnd_vendor = NULL;
glamor_egl = calloc(1, sizeof(*glamor_egl));
if (glamor_egl == NULL)
return FALSE;
if (xf86GlamorEGLPrivateIndex == -1)
xf86GlamorEGLPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
options = XNFalloc(sizeof(GlamorEGLOptions));
memcpy(options, GlamorEGLOptions, sizeof(GlamorEGLOptions));
xf86ProcessOptions(scrn->scrnIndex, scrn->options, options);
glvnd_vendor = xf86GetOptValString(options, GLAMOREGLOPT_VENDOR_LIBRARY);
if (glvnd_vendor) {
glamor_egl->glvnd_vendor = strdup(glvnd_vendor);
if (!glamor_egl->glvnd_vendor) {
LogMessage(X_WARNING, "Couldn't set gl vendor to: %s\n", glvnd_vendor);
}
}
api = xf86GetOptValString(options, GLAMOREGLOPT_RENDERING_API);
if (api && !strncasecmp(api, "es", 2))
glamor_egl->force_es = TRUE;
else if (api && !strncasecmp(api, "gl", 2))
glamor_egl->es_disallowed = TRUE;
free(options);
glamor_egl->GLAMOR_EGL_PRIV_PROC = glamor_xf86_egl_get_screen_private;
scrn->privates[xf86GlamorEGLPrivateIndex].ptr = glamor_egl;
glamor_egl->fd = fd;
if (glamor_egl_init2(glamor_egl)) {
glamor_egl->saved_free_screen = scrn->FreeScreen;
scrn->FreeScreen = glamor_xf86_egl_free_screen;
return TRUE;
}
free(glamor_egl);
return FALSE;
}
/** Stub to retain compatibility with pre-server-1.16 ABI. */
Bool
glamor_egl_init_textured_pixmap(ScreenPtr screen)

11
glamor/glamor_egl.h
View File

@@ -43,9 +43,16 @@ typedef struct glamor_egl_screen_private {
int fd;
int dmabuf_capable;
void* saved_free_screen;
} glamor_egl_priv_t;
int es_disallowed; /* If using GLES contexts is forbidden */
int force_es; /* If glamor should only use GLES contexts */
int llvmpipe_allowed; /* If glamor render accel should initialize on llvmpipe */
void* saved_free_screen;
/* Function that maps each screen to a glamor_egl_priv_t */
struct glamor_egl_screen_private* (*GLAMOR_EGL_PRIV_PROC)(ScreenPtr screen);
} glamor_egl_priv_t;
/*
* Create an EGLDisplay from a native display type. This is a little quirky