diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-09 14:51:25 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-09-09 14:51:25 +0000 |
commit | b858ad42ca8e4a6c6baee100fa1b4f1dfa186e06 (patch) | |
tree | 150c594827a4de453ad9d8290ad36cd6a01e8180 /xserver/glx/glxdriswrast.c | |
parent | 647c0111f724d6ae363908cf53647b0725f58247 (diff) |
revert a local patch to check for swrastg, LLVMpipe installs as swrast now
ok mpi@ ajacoutot@
Diffstat (limited to 'xserver/glx/glxdriswrast.c')
-rw-r--r-- | xserver/glx/glxdriswrast.c | 12 |
1 files changed, 1 insertions, 11 deletions
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; } |