egl: add _EGL_PLATFORM_ANDROID

[mesa.git] / src / glx / drisw_glx.c

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 237ce1761765b60d8b92baeafe1e31a6fdec1cd0..7bd64506ee8ed2074066be373391409b4fba468c 100644 (file)
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -100,6 +100,13 @@ XCreateDrawable(struct drisw_drawable * pdp,
                               32,                     /* bitmap_pad */
                               0);                     /* bytes_per_line */
 
+  /**
+   * swrast does not handle 24-bit depth with 24 bpp, so let X do the
+   * the conversion for us.
+   */
+  if (pdp->ximage->bits_per_pixel == 24)
+     pdp->ximage->bits_per_pixel = 32;
+
    return True;
 }
 
@@ -128,13 +135,11 @@ swrastGetDrawableInfo(__DRIdrawable * draw,
    Drawable drawable;
 
    Window root;
-   Status stat;
    unsigned uw, uh, bw, depth;
 
    drawable = pdraw->xDrawable;
 
-   stat = XGetGeometry(dpy, drawable, &root,
-                       x, y, &uw, &uh, &bw, &depth);
+   XGetGeometry(dpy, drawable, &root, x, y, &uw, &uh, &bw, &depth);
    *w = uw;
    *h = uh;
 }
@@ -244,6 +249,8 @@ drisw_destroy_context(struct glx_context *context)
    struct drisw_context *pcp = (struct drisw_context *) context;
    struct drisw_screen *psc = (struct drisw_screen *) context->psc;
 
+   driReleaseDrawables(&pcp->base);
+
    if (context->xid)
       glx_send_destroy_context(psc->base.dpy, context->xid);
 
@@ -266,6 +273,8 @@ drisw_bind_context(struct glx_context *context, struct glx_context *old,
    pdraw = (struct drisw_drawable *) driFetchDrawable(context, draw);
    pread = (struct drisw_drawable *) driFetchDrawable(context, read);
 
+   driReleaseDrawables(&pcp->base);
+
    if (pdraw == NULL || pread == NULL)
       return GLXBadDrawable;
 
@@ -283,8 +292,6 @@ drisw_unbind_context(struct glx_context *context, struct glx_context *new)
    struct drisw_screen *psc = (struct drisw_screen *) pcp->base.psc;
 
    (*psc->core->unbindContext) (pcp->driContext);
-
-   driReleaseDrawables(&pcp->base);
 }
 
 static const struct glx_context_vtable drisw_context_vtable = {
@@ -296,6 +303,7 @@ static const struct glx_context_vtable drisw_context_vtable = {
    DRI_glXUseXFont,
    NULL,
    NULL,
+   NULL, /* get_proc_address */
 };
 
 static struct glx_context *
@@ -340,7 +348,7 @@ drisw_create_context(struct glx_screen *base,
 }
 
 static void
-driDestroyDrawable(__GLXDRIdrawable * pdraw)
+driswDestroyDrawable(__GLXDRIdrawable * pdraw)
 {
    struct drisw_drawable *pdp = (struct drisw_drawable *) pdraw;
    struct drisw_screen *psc = (struct drisw_screen *) pdp->base.psc;
@@ -352,8 +360,8 @@ driDestroyDrawable(__GLXDRIdrawable * pdraw)
 }
 
 static __GLXDRIdrawable *
-driCreateDrawable(struct glx_screen *base, XID xDrawable,
-                 GLXDrawable drawable, struct glx_config *modes)
+driswCreateDrawable(struct glx_screen *base, XID xDrawable,
+                   GLXDrawable drawable, struct glx_config *modes)
 {
    struct drisw_drawable *pdp;
    __GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) modes;
@@ -361,10 +369,6 @@ driCreateDrawable(struct glx_screen *base, XID xDrawable,
 
    const __DRIswrastExtension *swrast = psc->swrast;
 
-   /* Old dri can't handle GLX 1.3+ drawable constructors. */
-   if (xDrawable != drawable)
-      return NULL;
-
    pdp = Xmalloc(sizeof(*pdp));
    if (!pdp)
       return NULL;
@@ -386,14 +390,14 @@ driCreateDrawable(struct glx_screen *base, XID xDrawable,
       return NULL;
    }
 
-   pdp->base.destroyDrawable = driDestroyDrawable;
+   pdp->base.destroyDrawable = driswDestroyDrawable;
 
    return &pdp->base;
 }
 
 static int64_t
-driSwapBuffers(__GLXDRIdrawable * pdraw,
-               int64_t target_msc, int64_t divisor, int64_t remainder)
+driswSwapBuffers(__GLXDRIdrawable * pdraw,
+                 int64_t target_msc, int64_t divisor, int64_t remainder)
 {
    struct drisw_drawable *pdp = (struct drisw_drawable *) pdraw;
    struct drisw_screen *psc = (struct drisw_screen *) pdp->base.psc;
@@ -408,7 +412,7 @@ driSwapBuffers(__GLXDRIdrawable * pdraw,
 }
 
 static void
-driDestroyScreen(struct glx_screen *base)
+driswDestroyScreen(struct glx_screen *base)
 {
    struct drisw_screen *psc = (struct drisw_screen *) base;
 
@@ -428,9 +432,6 @@ driOpenSwrast(void)
    if (driver == NULL)
       driver = driOpenDriver("swrast");
 
-   if (driver == NULL)
-      driver = driOpenDriver("swrastg");
-
    return driver;
 }
 
@@ -439,7 +440,7 @@ static const struct glx_screen_vtable drisw_screen_vtable = {
 };
 
 static struct glx_screen *
-driCreateScreen(int screen, struct glx_display *priv)
+driswCreateScreen(int screen, struct glx_display *priv)
 {
    __GLXDRIscreen *psp;
    const __DRIconfig **driver_configs;
@@ -452,8 +453,10 @@ driCreateScreen(int screen, struct glx_display *priv)
       return NULL;
 
    memset(psc, 0, sizeof *psc);
-   if (!glx_screen_init(&psc->base, screen, priv))
-       return NULL;
+   if (!glx_screen_init(&psc->base, screen, priv)) {
+      Xfree(psc);
+      return NULL;
+   }
 
    psc->driver = driOpenSwrast();
    if (psc->driver == NULL)
@@ -495,15 +498,16 @@ driCreateScreen(int screen, struct glx_display *priv)
    psc->base.vtable = &drisw_screen_vtable;
    psp = &psc->vtable;
    psc->base.driScreen = psp;
-   psp->destroyScreen = driDestroyScreen;
-   psp->createDrawable = driCreateDrawable;
-   psp->swapBuffers = driSwapBuffers;
+   psp->destroyScreen = driswDestroyScreen;
+   psp->createDrawable = driswCreateDrawable;
+   psp->swapBuffers = driswSwapBuffers;
 
    return &psc->base;
 
  handle_error:
    if (psc->driver)
       dlclose(psc->driver);
+   glx_screen_cleanup(&psc->base);
    Xfree(psc);
 
    ErrorMessageF("reverting to indirect rendering\n");
@@ -514,7 +518,7 @@ driCreateScreen(int screen, struct glx_display *priv)
 /* Called from __glXFreeDisplayPrivate.
  */
 static void
-driDestroyDisplay(__GLXDRIdisplay * dpy)
+driswDestroyDisplay(__GLXDRIdisplay * dpy)
 {
    Xfree(dpy);
 }
@@ -533,8 +537,8 @@ driswCreateDisplay(Display * dpy)
    if (pdpyp == NULL)
       return NULL;
 
-   pdpyp->base.destroyDisplay = driDestroyDisplay;
-   pdpyp->base.createScreen = driCreateScreen;
+   pdpyp->base.destroyDisplay = driswDestroyDisplay;
+   pdpyp->base.createScreen = driswCreateScreen;
 
    return &pdpyp->base;
 }