From b972e55684249d85d0e2790a8d713b8be9649188 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Mon, 24 Feb 2014 20:44:41 +0100 Subject: [PATCH] glx_pbuffer: Refactor GetDrawableAttribute Move the pdraw != NULL check out so that they don't have to be duplicated. Signed-off-by: Adel Gadllah Reviewed-by: Ian Romanick --- src/glx/glx_pbuffer.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index 411d6e572f1..978730cecb3 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -350,6 +350,9 @@ GetDrawableAttribute(Display * dpy, GLXDrawable drawable, _XEatData(dpy, length); } else { +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) + __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable); +#endif _XRead(dpy, (char *) data, length * sizeof(CARD32)); /* Search the set of returned attributes for the attribute requested by @@ -363,13 +366,11 @@ GetDrawableAttribute(Display * dpy, GLXDrawable drawable, } #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - { - __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable); - - if (pdraw != NULL && !pdraw->textureTarget) + if (pdraw != NULL) { + if (!pdraw->textureTarget) pdraw->textureTarget = determineTextureTarget((const int *) data, num_attributes); - if (pdraw != NULL && !pdraw->textureFormat) + if (!pdraw->textureFormat) pdraw->textureFormat = determineTextureFormat((const int *) data, num_attributes); } -- 2.11.0