From 63a6fd6603574c1c01324fbeb0863e39d3864c16 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Tue, 6 Dec 2011 10:20:30 -0800 Subject: glx: Fix indirect fallback when a non-Mesa GLX extension is present. When driCreateScreen calls driConvertConfigs to try to convert the configs for swrast, it fails and returns NULL. Instead of checking, it just clobbers psc->base.configs. Then, when the application asks for the FBconfigs, there aren't any. Instead, make the caller responsible for freeing the old modes lists if both calls to driConvertConfigs succeed. Without the second fix, glxinfo fails unless you run it with LIBGL_ALWAYS_INDIRECT: $ glxinfo name of display: :0.0 Error: couldn't find RGB GLX visual or fbconfig $ LIBGL_ALWAYS_INDIRECT=1 glxinfo name of display: :0.0 display: :0 screen: 0 direct rendering: No (LIBGL_ALWAYS_INDIRECT set) server glx vendor string: NVIDIA Corporation server glx version string: 1.4 [...] Signed-off-by: Aaron Plattner Reviewed-and-tested-by: Ian Romanick Signed-off-by: Brian Paul --- src/glx/dri2_glx.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/glx/dri2_glx.c') diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 940626c2020..553869a53f9 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -865,6 +865,7 @@ dri2CreateScreen(int screen, struct glx_display * priv) priv->dri2Display; struct dri2_screen *psc; __GLXDRIscreen *psp; + struct glx_config *configs = NULL, *visuals = NULL; char *driverName, *deviceName; drm_magic_t magic; int i; @@ -947,10 +948,16 @@ dri2CreateScreen(int screen, struct glx_display * priv) extensions = psc->core->getExtensions(psc->driScreen); dri2BindExtensions(psc, extensions); - psc->base.configs = - driConvertConfigs(psc->core, psc->base.configs, driver_configs); - psc->base.visuals = - driConvertConfigs(psc->core, psc->base.visuals, driver_configs); + configs = driConvertConfigs(psc->core, psc->base.configs, driver_configs); + visuals = driConvertConfigs(psc->core, psc->base.visuals, driver_configs); + + if (!configs || !visuals) + goto handle_error; + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; + glx_config_destroy_list(psc->base.visuals); + psc->base.visuals = visuals; psc->driver_configs = driver_configs; @@ -994,10 +1001,18 @@ dri2CreateScreen(int screen, struct glx_display * priv) return &psc->base; handle_error: + if (configs) + glx_config_destroy_list(configs); + if (visuals) + glx_config_destroy_list(visuals); + if (psc->driScreen) + psc->core->destroyScreen(psc->driScreen); + psc->driScreen = NULL; if (psc->fd >= 0) close(psc->fd); if (psc->driver) dlclose(psc->driver); + Xfree(driverName); Xfree(deviceName); glx_screen_cleanup(&psc->base); -- cgit v1.2.3