Drop glcore GLX provider.

Obsoleted by the DRI swrast driver.

3 files changed, 1 insertions, 530 deletions

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 620fc9b97..76fd6e649 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -57,7 +57,6 @@ libglx_la_SOURCES = \
         glxdrawable.h \
         glxext.c \
         glxext.h \
-        glxglcore.c \
 	glxdriswrast.c \
 	glxdricommon.c \
         glxscreens.c \
diff --git a/GL/glx/glxdriswrast.c b/GL/glx/glxdriswrast.c
index b3b95995d..50dee5111 100644
--- a/GL/glx/glxdriswrast.c
+++ b/GL/glx/glxdriswrast.c
@@ -537,7 +537,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     return NULL;
 }
 
-__GLXprovider __glXDRIswrastProvider = {
+__GLXprovider __glXDRISWRastProvider = {
     __glXDRIscreenProbe,
     "DRISWRAST",
     NULL
diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
deleted file mode 100644
index dafa9bca7..000000000
--- a/GL/glx/glxglcore.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Kevin E. Martin <kevin@precisioninsight.com>
- *   Brian E. Paul <brian@precisioninsight.com>
- *
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <string.h>
-#include <dlfcn.h>
-
-#define _NEED_GL_CORE_IF
-#include <GL/xmesa.h>
-#include <GL/internal/glcore.h>
-#include <glxserver.h>
-#include <glxscreens.h>
-#include <glxdrawable.h>
-#include <glxcontext.h>
-#include <glxutil.h>
-
-#include "os.h"
-
-#define XMesaCreateVisual       (*glcore->XMesaCreateVisual)
-#define XMesaDestroyVisual      (*glcore->XMesaDestroyVisual)
-
-#define XMesaCreateWindowBuffer (*glcore->XMesaCreateWindowBuffer)
-#define XMesaCreatePixmapBuffer (*glcore->XMesaCreatePixmapBuffer)
-#define XMesaDestroyBuffer      (*glcore->XMesaDestroyBuffer)
-#define XMesaSwapBuffers        (*glcore->XMesaSwapBuffers)
-#define XMesaResizeBuffers      (*glcore->XMesaResizeBuffers)
-
-#define XMesaCreateContext      (*glcore->XMesaCreateContext)
-#define XMesaDestroyContext     (*glcore->XMesaDestroyContext)
-#define XMesaCopyContext        (*glcore->XMesaCopyContext)
-#define XMesaMakeCurrent2       (*glcore->XMesaMakeCurrent2)
-#define XMesaForceCurrent       (*glcore->XMesaForceCurrent)
-#define XMesaLoseCurrent        (*glcore->XMesaLoseCurrent)
-
-typedef struct __GLXMESAscreen   __GLXMESAscreen;
-typedef struct __GLXMESAcontext  __GLXMESAcontext;
-typedef struct __GLXMESAdrawable __GLXMESAdrawable;
-
-struct __GLXMESAscreen {
-    __GLXscreen   base;
-    int           index;
-    int           num_vis;
-    XMesaVisual  *xm_vis;
-    void         *driver;
-
-    const __GLcoreModule *glcore;
-};
-
-struct __GLXMESAcontext {
-    __GLXcontext base;
-    XMesaContext xmesa;
-};
-
-struct __GLXMESAdrawable {
-    __GLXdrawable    base;
-    XMesaBuffer      xm_buf;
-    __GLXMESAscreen *screen;
-};
-
-static XMesaVisual find_mesa_visual(__GLXscreen *screen, XID fbconfigID);
-
-
-static void
-__glXMesaDrawableDestroy(__GLXdrawable *base)
-{
-    __GLXMESAdrawable *glxPriv = (__GLXMESAdrawable *) base;
-    const __GLcoreModule *glcore = glxPriv->screen->glcore;
-
-    if (glxPriv->xm_buf != NULL)
-      XMesaDestroyBuffer(glxPriv->xm_buf);
-    xfree(glxPriv);
-}
-
-static GLboolean
-__glXMesaDrawableResize(__GLXdrawable *base)
-{
-    __GLXMESAdrawable *glxPriv = (__GLXMESAdrawable *) base;
-    const __GLcoreModule *glcore = glxPriv->screen->glcore;
-
-    XMesaResizeBuffers(glxPriv->xm_buf);
-
-    return GL_TRUE;
-}
-
-static GLboolean
-__glXMesaDrawableSwapBuffers(__GLXdrawable *base)
-{
-    __GLXMESAdrawable *glxPriv = (__GLXMESAdrawable *) base;
-    const __GLcoreModule *glcore = glxPriv->screen->glcore;
-
-    /* This is terrifying: XMesaSwapBuffers() ends up calling CopyArea
-     * to do the buffer swap, but this assumes that the server holds
-     * the lock and has its context visible.  If another screen uses a
-     * DRI driver, that will have installed the DRI enter/leave server
-     * functions, which lifts the lock during GLX dispatch.  This is
-     * why we need to re-take the lock and swap in the server context
-     * before calling XMesaSwapBuffers() here.  /me shakes head. */
-
-    __glXenterServer(GL_FALSE);
-
-    XMesaSwapBuffers(glxPriv->xm_buf);
-
-    __glXleaveServer(GL_FALSE);
-
-    return GL_TRUE;
-}
-
-
-static __GLXdrawable *
-__glXMesaScreenCreateDrawable(__GLXscreen *screen,
-			      DrawablePtr pDraw, int type,
-			      XID drawId,
-			      __GLXconfig *modes)
-{
-    __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
-    const __GLcoreModule *glcore = mesaScreen->glcore;
-    __GLXMESAdrawable *glxPriv;
-    XMesaVisual xm_vis;
-
-    glxPriv = xalloc(sizeof *glxPriv);
-    if (glxPriv == NULL)
-	return NULL;
-
-    memset(glxPriv, 0, sizeof *glxPriv);
-
-    glxPriv->screen = mesaScreen;
-    if (!__glXDrawableInit(&glxPriv->base, screen,
-			   pDraw, type, drawId, modes)) {
-        xfree(glxPriv);
-	return NULL;
-    }
-
-    glxPriv->base.destroy     = __glXMesaDrawableDestroy;
-    glxPriv->base.resize      = __glXMesaDrawableResize;
-    glxPriv->base.swapBuffers = __glXMesaDrawableSwapBuffers;
-
-    xm_vis = find_mesa_visual(screen, modes->fbconfigID);
-    if (xm_vis == NULL) {
-	ErrorF("find_mesa_visual returned NULL for visualID = 0x%04x\n",
-	       modes->visualID);
-	xfree(glxPriv);
-	return NULL;
-    }
-
-    if (glxPriv->base.type == DRAWABLE_WINDOW) {
-	glxPriv->xm_buf = XMesaCreateWindowBuffer(xm_vis, (WindowPtr)pDraw);
-    } else {
-	glxPriv->xm_buf = XMesaCreatePixmapBuffer(xm_vis, (PixmapPtr)pDraw, 0);
-    }
-
-    if (glxPriv->xm_buf == NULL) {
-	xfree(glxPriv);
-	return NULL;
-    }
-
-    return &glxPriv->base;
-}
-
-static void
-__glXMesaContextDestroy(__GLXcontext *baseContext)
-{
-    __GLXMESAcontext *context = (__GLXMESAcontext *) baseContext;
-    __GLXMESAscreen *screen = (__GLXMESAscreen *) context->base.pGlxScreen;
-    const __GLcoreModule *glcore = screen->glcore;
-
-    XMesaDestroyContext(context->xmesa);
-    __glXContextDestroy(&context->base);
-    xfree(context);
-}
-
-static int
-__glXMesaContextMakeCurrent(__GLXcontext *baseContext)
-
-{
-    __GLXMESAcontext *context = (__GLXMESAcontext *) baseContext;
-    __GLXMESAdrawable *drawPriv = (__GLXMESAdrawable *) context->base.drawPriv;
-    __GLXMESAdrawable *readPriv = (__GLXMESAdrawable *) context->base.readPriv;
-    __GLXMESAscreen *screen = (__GLXMESAscreen *) context->base.pGlxScreen;
-    const __GLcoreModule *glcore = screen->glcore;
-
-    return XMesaMakeCurrent2(context->xmesa,
-			     drawPriv->xm_buf,
-			     readPriv->xm_buf);
-}
-
-static int
-__glXMesaContextLoseCurrent(__GLXcontext *baseContext)
-{
-    __GLXMESAcontext *context = (__GLXMESAcontext *) baseContext;
-    __GLXMESAscreen *screen = (__GLXMESAscreen *) context->base.pGlxScreen;
-    const __GLcoreModule *glcore = screen->glcore;
-
-    return XMesaLoseCurrent(context->xmesa);
-}
-
-static int
-__glXMesaContextCopy(__GLXcontext *baseDst,
-		     __GLXcontext *baseSrc,
-		     unsigned long mask)
-{
-    __GLXMESAcontext *dst = (__GLXMESAcontext *) baseDst;
-    __GLXMESAcontext *src = (__GLXMESAcontext *) baseSrc;
-    __GLXMESAscreen *screen = (__GLXMESAscreen *) dst->base.pGlxScreen;
-    const __GLcoreModule *glcore = screen->glcore;
-
-    return XMesaCopyContext(src->xmesa, dst->xmesa, mask);
-}
-
-static int
-__glXMesaContextForceCurrent(__GLXcontext *baseContext)
-{
-    __GLXMESAcontext *context = (__GLXMESAcontext *) baseContext;
-    __GLXMESAscreen *screen = (__GLXMESAscreen *) context->base.pGlxScreen;
-    const __GLcoreModule *glcore = screen->glcore;
-
-    /* GlxSetRenderTables() call for XGL moved in XMesaForceCurrent() */
-
-    return XMesaForceCurrent(context->xmesa);
-}
-
-static __GLXcontext *
-__glXMesaScreenCreateContext(__GLXscreen *screen,
-			     __GLXconfig *config,
-			     __GLXcontext *baseShareContext)
-{
-    __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
-    const __GLcoreModule *glcore = mesaScreen->glcore;
-    __GLXMESAcontext *context;
-    __GLXMESAcontext *shareContext = (__GLXMESAcontext *) baseShareContext;
-    XMesaVisual xm_vis;
-    XMesaContext xm_share;
-
-    context = xalloc (sizeof (__GLXMESAcontext));
-    if (context == NULL)
-	return NULL;
-
-    memset(context, 0, sizeof *context);
-
-    context->base.pGlxScreen = screen;
-    context->base.config     = config;
-
-    context->base.destroy        = __glXMesaContextDestroy;
-    context->base.makeCurrent    = __glXMesaContextMakeCurrent;
-    context->base.loseCurrent    = __glXMesaContextLoseCurrent;
-    context->base.copy           = __glXMesaContextCopy;
-    context->base.forceCurrent   = __glXMesaContextForceCurrent;
-
-    xm_vis = find_mesa_visual(screen, config->fbconfigID);
-    if (!xm_vis) {
-	ErrorF("find_mesa_visual returned NULL for visualID = 0x%04x\n",
-	       config->visualID);
-	xfree(context);
-	return NULL;
-    }
-
-    xm_share = shareContext ? shareContext->xmesa : NULL;
-    context->xmesa = XMesaCreateContext(xm_vis, xm_share);
-    if (!context->xmesa) {
-	xfree(context);
-	return NULL;
-    }
-
-    return &context->base;
-}
-
-static void
-__glXMesaScreenDestroy(__GLXscreen *screen)
-{
-    __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
-    const __GLcoreModule *glcore = mesaScreen->glcore;
-    int i;
-
-    if (mesaScreen->xm_vis) {
-	for (i = 0; i < mesaScreen->base.numFBConfigs; i++) {
-	    if (mesaScreen->xm_vis[i])
-		XMesaDestroyVisual(mesaScreen->xm_vis[i]);
-	}
-
-	xfree(mesaScreen->xm_vis);
-    }
-
-    dlclose(mesaScreen->driver);
-
-    __glXScreenDestroy(screen);
-
-    xfree(screen);
-}
-
-static XMesaVisual
-find_mesa_visual(__GLXscreen *screen, XID fbconfigID)
-{
-    __GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
-    const __GLXconfig *config;
-    unsigned i = 0;
-
-    for (config = screen->fbconfigs; config != NULL; config = config->next) {
- 	if (config->fbconfigID == fbconfigID)
-	    return mesaScreen->xm_vis[i];
-	i++;
-    }
-
-    return NULL;
-}
-
-const static int numBack = 2;
-const static int numDepth = 2;
-const static int numStencil = 2;
-
-static const int glx_visual_types[] = {
-    GLX_STATIC_GRAY,
-    GLX_GRAY_SCALE,
-    GLX_STATIC_COLOR,
-    GLX_PSEUDO_COLOR,
-    GLX_TRUE_COLOR,
-    GLX_DIRECT_COLOR
-};
-
-static __GLXconfig *
-createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen,
-			 VisualPtr visual, __GLXconfig *config)
-{
-    int back, depth, stencil;
-
-    /* FIXME: Ok, I'm making all this up... anybody has a better idea? */
-
-    for (back = numBack - 1; back >= 0; back--)
-	for (depth = 0; depth < numDepth; depth++)
-	    for (stencil = 0; stencil < numStencil; stencil++) {
-		config->next = xcalloc(sizeof(*config), 1);
-		config = config->next;
-
-		config->visualRating = GLX_NONE;
-		config->visualType = glx_visual_types[visual->class];
-		config->xRenderable = GL_TRUE;
-		config->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT;
-		config->rgbMode = (visual->class >= TrueColor);
-		config->colorIndexMode = !config->rgbMode;
-		config->renderType =
-		    (config->rgbMode) ? GLX_RGBA_BIT : GLX_COLOR_INDEX_BIT;
-		config->doubleBufferMode = back;
-		config->haveDepthBuffer = depth;
-		config->depthBits = depth ? visual->nplanes : 0;
-		config->haveStencilBuffer = stencil;
-		config->stencilBits = stencil ? visual->bitsPerRGBValue : 0;
-		config->haveAccumBuffer = 0;
-
-		config->redBits = Ones(visual->redMask);
-		config->greenBits = Ones(visual->greenMask);
-		config->blueBits = Ones(visual->blueMask);
-		config->alphaBits = 0;
-		config->redMask = visual->redMask;
-		config->greenMask = visual->greenMask;
-		config->blueMask = visual->blueMask;
-		config->alphaMask = 0;
-		config->rgbBits = config->rgbMode ? visual->nplanes : 0;
-		config->indexBits = config->colorIndexMode ? visual->nplanes : 0;
-	    }
-
-    return config;
-}
-
-static void
-createFBConfigs(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
-{
-    __GLXconfig head, *tail;
-    int i;
-
-    /* We assume here that each existing visual correspond to a
-     * different visual class.  Note, this runs before COMPOSITE adds
-     * its visual, so it's not entirely crazy. */
-    pGlxScreen->numFBConfigs = pScreen->numVisuals * numBack * numDepth * numStencil;
-    
-    head.next = NULL;
-    tail = &head;
-    for (i = 0; i < pScreen->numVisuals; i++)
-	tail = createFBConfigsForVisual(pGlxScreen, pScreen,
-					&pScreen->visuals[i], tail);
-
-    pGlxScreen->fbconfigs = head.next;
-}
-
-static void
-createMesaVisuals(__GLXMESAscreen *pMesaScreen)
-{
-    const __GLcoreModule *glcore = pMesaScreen->glcore;
-    __GLXconfig *config;
-    ScreenPtr pScreen;
-    VisualPtr visual = NULL;
-    int i, j;
-
-    i = 0;
-    pScreen = pMesaScreen->base.pScreen;
-    pMesaScreen->xm_vis =
-	xcalloc(pMesaScreen->base.numFBConfigs, sizeof (XMesaVisual));
-    for (config = pMesaScreen->base.fbconfigs; config != NULL; config = config->next) {
-	for (j = 0; j < pScreen->numVisuals; j++)
-	    if (pScreen->visuals[j].vid == config->visualID) {
-		visual = &pScreen->visuals[j];
-		break;
-	    }
-
-	pMesaScreen->xm_vis[i++] =
-	    XMesaCreateVisual(pScreen,
-			      visual,
-			      config->rgbMode,
-			      (config->alphaBits > 0),
-			      config->doubleBufferMode,
-			      config->stereoMode,
-			      GL_TRUE, /* ximage_flag */
-			      config->depthBits,
-			      config->stencilBits,
-			      config->accumRedBits,
-			      config->accumGreenBits,
-			      config->accumBlueBits,
-			      config->accumAlphaBits,
-			      config->samples,
-			      config->level,
-			      config->visualRating);
-    }
-}
-
-static const char dri_driver_path[] = DRI_DRIVER_PATH;
-
-static __GLXscreen *
-__glXMesaScreenProbe(ScreenPtr pScreen)
-{
-    __GLXMESAscreen *screen;
-    char filename[128];
-
-    screen = xalloc(sizeof *screen);
-    if (screen == NULL)
-	return NULL;
-
-    snprintf(filename, sizeof filename, "%s/%s.so",
-             dri_driver_path, "libGLcore");
-
-    screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-    if (screen->driver == NULL) {
-        LogMessage(X_ERROR, "GLX error: dlopen of %s failed (%s)\n",
-                   filename, dlerror());
-        goto handle_error;
-    }
-
-    screen->glcore = dlsym(screen->driver, __GL_CORE);
-    if (screen->glcore == NULL) {
-        LogMessage(X_ERROR, "GLX error: dlsym for %s failed (%s)\n",
-                   __GL_CORE, dlerror());
-        goto handle_error;
-    }
-
-    /*
-     * Find the GLX visuals that are supported by this screen and create
-     * XMesa's visuals.
-     */
-    createFBConfigs(&screen->base, pScreen);
-
-    __glXScreenInit(&screen->base, pScreen);
-
-    /* Now that GLX has created the corresponding X visual, create the mesa visuals. */
-    createMesaVisuals(screen);
-
-    screen->base.destroy        = __glXMesaScreenDestroy;
-    screen->base.createContext  = __glXMesaScreenCreateContext;
-    screen->base.createDrawable = __glXMesaScreenCreateDrawable;
-    screen->base.swapInterval  = NULL;
-    screen->base.pScreen       = pScreen;
-
-    LogMessage(X_INFO, "GLX: Loaded and initialized %s\n", filename);
-
-    return &screen->base;
-
-handle_error:
-
-    if (screen->driver)
-        dlclose(screen->driver);
-
-    xfree(screen);
-
-    FatalError("GLX: could not load software renderer\n");
-
-    return NULL;
-}
-
-__GLXprovider __glXMesaProvider = {
-    __glXMesaScreenProbe,
-    "MESA",
-    NULL
-};
-
-__GLXprovider *
-GlxGetMesaProvider (void)
-{
-    return &__glXMesaProvider;
-}