From b858ad42ca8e4a6c6baee100fa1b4f1dfa186e06 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 9 Sep 2013 14:51:25 +0000 Subject: revert a local patch to check for swrastg, LLVMpipe installs as swrast now ok mpi@ ajacoutot@ --- xserver/glx/glxdriswrast.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'xserver/glx/glxdriswrast.c') diff --git a/xserver/glx/glxdriswrast.c b/xserver/glx/glxdriswrast.c index 68f9434a2..b47839868 100644 --- a/xserver/glx/glxdriswrast.c +++ b/xserver/glx/glxdriswrast.c @@ -432,7 +432,7 @@ initializeExtensions(__GLXDRIscreen * screen) static __GLXscreen * __glXDRIscreenProbe(ScreenPtr pScreen) { - const char *driverName = "swrastg"; + const char *driverName = "swrast"; __GLXDRIscreen *screen; screen = calloc(1, sizeof *screen); @@ -450,16 +450,6 @@ __glXDRIscreenProbe(ScreenPtr pScreen) __DRI_CORE, __DRI_CORE_VERSION, (void **) &screen->swrast, __DRI_SWRAST, __DRI_SWRAST_VERSION); - - if (screen->driver == NULL) { - driverName = "swrast"; - screen->driver = glxProbeDriver(driverName, - (void **) &screen->core, - __DRI_CORE, __DRI_CORE_VERSION, - (void **) &screen->swrast, - __DRI_SWRAST, __DRI_SWRAST_VERSION); - } - if (screen->driver == NULL) { goto handle_error; } -- cgit v1.2.3