andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bail out early if screen doesn't support DRI.

Browse Source
This commit is contained in:
Kristian Høgsberg 2006-03-14 19:32:27 +00:00
parent 0cc34266d6
commit 01aa209f20
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

9
GL/glx/glxdri.c
View File

@ -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;
}