Bail out early if screen doesn't support DRI.
This commit is contained in:
parent
0cc34266d6
commit
01aa209f20
|
@ -1,3 +1,8 @@
|
|||
2006-03-14 Kristian Høgsberg <krh@redhat.com>
|
||||
|
||||
* GL/glx/glxdri.c (__glXDRIscreenProbe): Bail out early if screen
|
||||
doesn't support DRI.
|
||||
|
||||
2006-3-13 Deron Johnson <deron.johnson@sun.com>
|
||||
|
||||
* composite/compalloc.c
|
||||
|
|
|
@ -723,6 +723,13 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
__GLXDRIscreen *screen;
|
||||
void *dev_priv = NULL;
|
||||
char filename[128];
|
||||
Bool isCapable;
|
||||
|
||||
if (!DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {
|
||||
LogMessage(X_ERROR,
|
||||
"AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
screen = __glXMalloc(sizeof *screen);
|
||||
if (screen == NULL)
|
||||
|
@ -914,7 +921,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
else
|
||||
LogMessage(X_ERROR, "AIGLX error: %s failed\n", err_msg);
|
||||
|
||||
ErrorF("GLX-DRI: reverting to software rendering\n");
|
||||
LogMessage(X_ERROR, "GLX-DRI: reverting to software rendering\n");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user