Mesa (master): glx: return GL_FALSE from glx_screen_init where applicable.
Emil Velikov
evelikov at kemper.freedesktop.org
Thu Oct 6 15:20:43 UTC 2016
Module: Mesa
Branch: master
Commit: 2e9e05dfca18c7f09caa40396d6dd4f2b3ddc1d4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e9e05dfca18c7f09caa40396d6dd4f2b3ddc1d4
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Fri Sep 30 11:01:27 2016 +0100
glx: return GL_FALSE from glx_screen_init where applicable.
Return GL_FALSE if we fail to find any fb/visual configs, otherwise we
end up with all sorts of chaos further down the GLX stack.
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/glx/glxext.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index f6bc377..9ef7ff5 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -748,8 +748,11 @@ glx_screen_init(struct glx_screen *psc,
psc->dpy = priv->dpy;
psc->display = priv;
- getVisualConfigs(psc, priv, screen);
- getFBConfigs(psc, priv, screen);
+ if (!getVisualConfigs(psc, priv, screen))
+ return GL_FALSE;
+
+ if (!getFBConfigs(psc, priv, screen))
+ return GL_FALSE;
return GL_TRUE;
}
More information about the mesa-commit
mailing list