diff options
| author | Adel Gadllah <[email protected]> | 2014-02-24 20:44:41 +0100 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-03-07 16:59:57 -0800 |
| commit | b972e55684249d85d0e2790a8d713b8be9649188 (patch) | |
| tree | 986db6e3588f906a673898cf7aa4c41a08dee4a0 | |
| parent | 6b13cd1f7f635fb7ac7dc7d317bd9c4870d4d81e (diff) | |
glx_pbuffer: Refactor GetDrawableAttribute
Move the pdraw != NULL check out so that they don't
have to be duplicated.
Signed-off-by: Adel Gadllah <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/glx/glx_pbuffer.c | 11 |
1 files 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); } |