OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: rework/simplify drisw zink handling

Browse Source 
this pushes the logic further down so it's all in one place

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30375>
This commit is contained in:
Mike Blumenkrantz
2024-07-19 08:59:10 -04:00
committed by Marge Bot
parent 08e2985e57
commit 6be546764a
4 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/glx/drisw_glx.c
View File

@@ -797,6 +797,7 @@ driswDestroyScreen(struct glx_screen *base)
psc->core->destroyScreen(psc->driScreen);
driDestroyConfigs(psc->driver_configs);
psc->driScreen = NULL;
free(psc->name);
free(psc);
}
@@ -929,9 +930,8 @@ kopperGetSwapInterval(__GLXDRIdrawable *pdraw)
return pdp->swapInterval;
}
static struct glx_screen *
driswCreateScreenDriver(int screen, struct glx_display *priv,
const char *driver, bool driver_name_is_inferred)
struct glx_screen *
driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driver, bool driver_name_is_inferred)
{
__GLXDRIscreen *psp;
const __DRIconfig **driver_configs;
@@ -939,7 +939,10 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
struct drisw_screen *psc;
struct glx_config *configs = NULL, *visuals = NULL;
const __DRIextension **loader_extensions_local;
const struct drisw_display *pdpyp = (struct drisw_display *)priv->driswDisplay;
/* this is only relevant if zink bits are set */
glx_driver &= (GLX_DRIVER_ZINK_INFER | GLX_DRIVER_ZINK_YES);
const char *driver = glx_driver && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) ? "zink" : "swrast";
psc = calloc(1, sizeof *psc);
if (psc == NULL)
@@ -953,9 +956,9 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
extensions = driOpenDriver(driver, driver_name_is_inferred);
if (extensions == NULL)
goto handle_error;
psc->name = driver;
psc->name = strdup(driver);
if (pdpyp->zink)
if (glx_driver)
loader_extensions_local = kopper_extensions_noshm;
else if (!check_xshm(psc->base.dpy))
loader_extensions_local = loader_extensions_noshm;
@@ -977,7 +980,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
extensions,
&driver_configs, driver_name_is_inferred, psc);
if (psc->driScreen == NULL) {
if (!pdpyp->zink || !driver_name_is_inferred)
if (!glx_driver || !driver_name_is_inferred)
ErrorMessageF("glx: failed to create drisw screen\n");
goto handle_error;
}
@@ -994,14 +997,14 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
}
#if defined(HAVE_DRI3)
if (pdpyp->zink) {
if (glx_driver) {
bool err;
psc->has_multibuffer = loader_dri3_check_multibuffer(XGetXCBConnection(priv->dpy), &err);
if (!psc->has_multibuffer &&
!debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false) &&
!debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) {
/* only print error if zink was explicitly requested */
if (pdpyp->zink & GLX_DRIVER_ZINK_YES)
if (glx_driver & GLX_DRIVER_ZINK_YES)
CriticalErrorMessageF("DRI3 not available\n");
goto handle_error;
}
@@ -1049,23 +1052,12 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
glx_screen_cleanup(&psc->base);
free(psc);
if (pdpyp->zink & GLX_DRIVER_ZINK_YES && !driver_name_is_inferred)
if (glx_driver & GLX_DRIVER_ZINK_YES && !driver_name_is_inferred)
CriticalErrorMessageF("failed to load driver: %s\n", driver);
return NULL;
}
struct glx_screen *
driswCreateScreen(int screen, struct glx_display *priv, bool driver_name_is_inferred)
{
const struct drisw_display *pdpyp = (struct drisw_display *)priv->driswDisplay;
if (pdpyp->zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false)) {
return driswCreateScreenDriver(screen, priv, "zink", driver_name_is_inferred);
}
return driswCreateScreenDriver(screen, priv, "swrast", driver_name_is_inferred);
}
/* Called from __glXFreeDisplayPrivate.
*/
void
@@ -1088,8 +1080,6 @@ driswCreateDisplay(Display * dpy, enum glx_driver glx_driver)
if (pdpyp == NULL)
return NULL;
pdpyp->zink = glx_driver & (GLX_DRIVER_ZINK_INFER | GLX_DRIVER_ZINK_YES);
return (void*)pdpyp;
}

3
src/glx/drisw_priv.h
View File

@@ -31,7 +31,6 @@
struct drisw_display
{
enum glx_driver zink;
};
struct drisw_screen
@@ -52,7 +51,7 @@ struct drisw_screen
const __DRIconfig **driver_configs;
const char *name;
char *name;
bool has_multibuffer;
};

2
src/glx/glxclient.h
View File

@@ -153,7 +153,7 @@ void dri3_destroy_display(__GLXDRIdisplay * dpy);
struct glx_screen *dri2CreateScreen(int screen, struct glx_display * priv, bool driver_name_is_inferred);
void dri2DestroyDisplay(__GLXDRIdisplay * dpy);
struct glx_screen *driswCreateScreen(int screen, struct glx_display *priv, bool driver_name_is_inferred);
struct glx_screen *driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver driver, bool driver_name_is_inferred);
void driswDestroyDisplay(__GLXDRIdisplay * dpy);
#endif

2
src/glx/glxext.c
View File

@@ -814,7 +814,7 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, enum glx_dr
if ((psc == GLX_LOADER_USE_ZINK || psc == NULL) &&
(glx_driver & GLX_DRIVER_SW || zink)) {
priv->driswDisplay = driswCreateDisplay(dpy, glx_driver);
psc = driswCreateScreen(i, priv, psc == GLX_LOADER_USE_ZINK ? false : driver_name_is_inferred);
psc = driswCreateScreen(i, priv, glx_driver, psc == GLX_LOADER_USE_ZINK ? false : driver_name_is_inferred);
}
#endif