From 2e3f067458e4a70da91b27fab61ef3d292ded4cf Mon Sep 17 00:00:00 2001 From: Bernard Kilarski Date: Tue, 7 Jun 2016 13:33:33 +0300 Subject: glx: fix error code when there is no context bound MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2: change all related NULL checks to check against dummyContext v3: really check for dummyContext *only* when ctx was from __glXGetCurrentContext v4: cover more checks, add dummyBuffer, dummyVtable (Emil) Signed-off-by: Bernard Kilarski Signed-off-by: Matt Roper Signed-off-by: Tapani Pälli Reviewed-by: Emil Velikov Cc: "11.2" --- src/glx/query_renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/glx/query_renderer.c') diff --git a/src/glx/query_renderer.c b/src/glx/query_renderer.c index 9108ec23af5..4debf0665f8 100644 --- a/src/glx/query_renderer.c +++ b/src/glx/query_renderer.c @@ -106,7 +106,7 @@ glXQueryCurrentRendererIntegerMESA(int attribute, unsigned int *value) { struct glx_context *gc = __glXGetCurrentContext(); - if (gc == NULL) + if (gc == &dummyContext) return False; return __glXQueryRendererInteger(gc->psc, attribute, value); @@ -166,7 +166,7 @@ glXQueryCurrentRendererStringMESA(int attribute) { struct glx_context *gc = __glXGetCurrentContext(); - if (gc == NULL) + if (gc == &dummyContext) return False; return __glXQueryRendererString(gc->psc, attribute); -- cgit v1.2.3