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

glx: use base screen has_multibuffer for drisw

Browse Source 
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 10:00:29 -04:00
committed by Marge Bot
parent e9aec758c6
commit 82955b48aa
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/glx/drisw_glx.c
View File

@@ -728,7 +728,7 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
pdp->driDrawable = pdp->driDrawable =
kopper->createNewDrawable(psc->driScreen, config->driConfig, pdp, kopper->createNewDrawable(psc->driScreen, config->driConfig, pdp,
&(__DRIkopperDrawableInfo){ &(__DRIkopperDrawableInfo){
.multiplanes_available = psc->has_multibuffer, .multiplanes_available = base->display->has_multibuffer,
.is_pixmap = !(type & GLX_WINDOW_BIT), .is_pixmap = !(type & GLX_WINDOW_BIT),
}); });
@@ -998,9 +998,7 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
#if defined(HAVE_DRI3) #if defined(HAVE_DRI3)
if (glx_driver) { if (glx_driver) {
bool err; if (!priv->has_multibuffer &&
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_ALWAYS_SOFTWARE", false) &&
!debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) { !debug_get_bool_option("LIBGL_KOPPER_DRI2", false)) {
/* only print error if zink was explicitly requested */ /* only print error if zink was explicitly requested */

2
src/glx/drisw_priv.h
View File

@@ -52,8 +52,6 @@ struct drisw_screen
const __DRIconfig **driver_configs; const __DRIconfig **driver_configs;
char *name; char *name;
bool has_multibuffer;
}; };
struct drisw_drawable struct drisw_drawable