diff options
author | Jesse Ruffin <jesse@eloquentpeasant.net> | 2008-06-23 14:35:20 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-06-23 14:35:20 -0400 |
commit | 3b587826924c60f6736dc5faf584b964fde1b4da (patch) | |
tree | 37c87e752513f7c6d43d31e1945d3b60120d83bc /hw/dmx | |
parent | c8d066a15142678041c1d82ccf530dcdb2ea74ca (diff) |
Bug #16302: Fix GLX drawable refcounting in DMX.
Diffstat (limited to 'hw/dmx')
-rw-r--r-- | hw/dmx/glxProxy/glxcmds.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index ab7ee96b9..2365f829f 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -1004,8 +1004,7 @@ static int MakeCurrent(__GLXclientState *cl, prevglxc->pGlxPixmap = 0; } - if (prevglxc->pGlxReadPixmap && - prevglxc->pGlxReadPixmap != prevglxc->pGlxPixmap ) { + if (prevglxc->pGlxReadPixmap) { /* ** The previous drawable was a glx pixmap, release it. */ @@ -1023,8 +1022,7 @@ static int MakeCurrent(__GLXclientState *cl, prevglxc->pGlxWindow = 0; } - if (prevglxc->pGlxReadWindow && - prevglxc->pGlxReadWindow != prevglxc->pGlxWindow) { + if (prevglxc->pGlxReadWindow) { /* ** The previous drawable was a glx window, release it. */ @@ -1042,8 +1040,7 @@ static int MakeCurrent(__GLXclientState *cl, prevglxc->pGlxPbuffer = 0; } - if (prevglxc->pGlxReadPbuffer && - prevglxc->pGlxReadPbuffer != prevglxc->pGlxPbuffer ) { + if (prevglxc->pGlxReadPbuffer) { /* ** The previous drawable was a glx Pbuffer, release it. */ @@ -1071,7 +1068,7 @@ static int MakeCurrent(__GLXclientState *cl, pGlxPixmap->refcnt++; } - if (pReadGlxPixmap && pReadGlxPixmap != pGlxPixmap) { + if (pReadGlxPixmap) { pReadGlxPixmap->refcnt++; } @@ -1079,7 +1076,7 @@ static int MakeCurrent(__GLXclientState *cl, pGlxWindow->refcnt++; } - if (pGlxReadWindow && pGlxReadWindow != pGlxWindow) { + if (pGlxReadWindow) { pGlxReadWindow->refcnt++; } @@ -1087,7 +1084,7 @@ static int MakeCurrent(__GLXclientState *cl, pGlxPbuffer->refcnt++; } - if (pGlxReadPbuffer && pGlxReadPbuffer != pGlxPbuffer) { + if (pGlxReadPbuffer) { pGlxReadPbuffer->refcnt++; } |