glx: fix retval checks when failures occur for drawable creation.

(cherry picked from commit a26c77ff43)
This commit is contained in:
Alan Hourihane 2009-02-13 13:45:08 +00:00 committed by Jeremy Huddleston
parent 0fd4d26240
commit 5cae7f5a60

View file

@ -642,7 +642,7 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
if (visual->vid == glxConfig->visualID)
break;
if (i == pScreen->numVisuals)
return GL_FALSE;
return NULL;
context->hwContextID = FakeClientID(0);
@ -651,6 +651,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
context->hwContextID, &hwContext);
__glXleaveServer(GL_FALSE);
if (!retval)
return NULL;
context->driContext =
screen->legacy->createNewContext(screen->driScreen,
config->driConfig,
@ -705,6 +708,11 @@ __glXDRIscreenCreateDrawable(__GLXscreen *screen,
pDraw, &hwDrawable);
__glXleaveServer(GL_FALSE);
if (!retval) {
xfree(private);
return NULL;
}
/* The last argument is 'attrs', which is used with pbuffers which
* we currently don't support. */