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

glx: add an 'implicit' param to createScreen

Browse Source 
Acked-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28139>
This commit is contained in:
Mike Blumenkrantz
2024-03-12 09:36:57 -04:00
committed by Marge Bot
parent 1b9ee76369
commit 91c757bda1
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glx/dri2_glx.c
View File

@@ -1001,7 +1001,7 @@ static const struct glx_screen_vtable dri2_screen_vtable = {
}; };
static struct glx_screen * static struct glx_screen *
dri2CreateScreen(int screen, struct glx_display * priv) dri2CreateScreen(int screen, struct glx_display * priv, bool implicit)
{ {
const __DRIconfig **driver_configs; const __DRIconfig **driver_configs;
const __DRIextension **extensions; const __DRIextension **extensions;

2
src/glx/dri3_glx.c
View File

@@ -790,7 +790,7 @@ static const struct glx_screen_vtable dri3_screen_vtable = {
*/ */
static struct glx_screen * static struct glx_screen *
dri3_create_screen(int screen, struct glx_display * priv) dri3_create_screen(int screen, struct glx_display * priv, bool implicit)
{ {
xcb_connection_t *c = XGetXCBConnection(priv->dpy); xcb_connection_t *c = XGetXCBConnection(priv->dpy);
const __DRIconfig **driver_configs; const __DRIconfig **driver_configs;

2
src/glx/drisw_glx.c
View File

@@ -1060,7 +1060,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
} }
static struct glx_screen * static struct glx_screen *
driswCreateScreen(int screen, struct glx_display *priv) driswCreateScreen(int screen, struct glx_display *priv, bool implicit)
{ {
const struct drisw_display *pdpyp = (struct drisw_display *)priv->driswDisplay; const struct drisw_display *pdpyp = (struct drisw_display *)priv->driswDisplay;
if (pdpyp->zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false)) { if (pdpyp->zink && !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false)) {

2
src/glx/driwindows_glx.c
View File

@@ -461,7 +461,7 @@ driwindowsMapConfigs(struct glx_display *priv, int screen, struct glx_config *co
} }
static struct glx_screen * static struct glx_screen *
driwindowsCreateScreen(int screen, struct glx_display *priv) driwindowsCreateScreen(int screen, struct glx_display *priv, bool implicit)
{ {
__GLXDRIscreen *psp; __GLXDRIscreen *psp;
struct driwindows_screen *psc; struct driwindows_screen *psc;

2
src/glx/glxclient.h
View File

@@ -87,7 +87,7 @@ struct __GLXDRIdisplayRec
*/ */
void (*destroyDisplay) (__GLXDRIdisplay * display); void (*destroyDisplay) (__GLXDRIdisplay * display);
struct glx_screen *(*createScreen)(int screen, struct glx_display * priv); struct glx_screen *(*createScreen)(int screen, struct glx_display * priv, bool implicit);
}; };
struct __GLXDRIscreenRec { struct __GLXDRIscreenRec {

8
src/glx/glxext.c
View File

@@ -783,19 +783,19 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv, Bool zink)
#if defined(GLX_USE_DRM) #if defined(GLX_USE_DRM)
#if defined(HAVE_DRI3) #if defined(HAVE_DRI3)
if (priv->dri3Display) if (priv->dri3Display)
psc = priv->dri3Display->createScreen(i, priv); psc = priv->dri3Display->createScreen(i, priv, false);
#endif /* HAVE_DRI3 */ #endif /* HAVE_DRI3 */
if (psc == NULL && priv->dri2Display) if (psc == NULL && priv->dri2Display)
psc = priv->dri2Display->createScreen(i, priv); psc = priv->dri2Display->createScreen(i, priv, false);
#endif /* GLX_USE_DRM */ #endif /* GLX_USE_DRM */
#ifdef GLX_USE_WINDOWSGL #ifdef GLX_USE_WINDOWSGL
if (psc == NULL && priv->windowsdriDisplay) if (psc == NULL && priv->windowsdriDisplay)
psc = priv->windowsdriDisplay->createScreen(i, priv); psc = priv->windowsdriDisplay->createScreen(i, priv, false);
#endif #endif
if ((psc == GLX_LOADER_USE_ZINK || psc == NULL) && priv->driswDisplay) if ((psc == GLX_LOADER_USE_ZINK || psc == NULL) && priv->driswDisplay)
psc = priv->driswDisplay->createScreen(i, priv); psc = priv->driswDisplay->createScreen(i, priv, false);
#endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */ #endif /* GLX_DIRECT_RENDERING && !GLX_USE_APPLEGL */
#if defined(GLX_USE_APPLE) #if defined(GLX_USE_APPLE)