X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Fdrisw_glx.c;h=a2777100a3219dbf3e385c09dfe903c00a5a34c2;hb=7076e9f116c2060a7f28680178d96c188c7177df;hp=fcb5d8f578934cfb94e75f1f9af23b14fa874346;hpb=83821ece79011d21303058e30694dd3796d072f2;p=mesa.git diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index fcb5d8f5789..a2777100a32 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -27,50 +27,13 @@ #include "glxclient.h" #include #include "dri_common.h" - -struct drisw_display -{ - __GLXDRIdisplay base; -}; - -struct drisw_context -{ - struct glx_context base; - __DRIcontext *driContext; - -}; - -struct drisw_screen -{ - struct glx_screen base; - - __DRIscreen *driScreen; - __GLXDRIscreen vtable; - const __DRIcoreExtension *core; - const __DRIswrastExtension *swrast; - const __DRItexBufferExtension *texBuffer; - const __DRIcopySubBufferExtension *copySubBuffer; - - const __DRIconfig **driver_configs; - - void *driver; -}; - -struct drisw_drawable -{ - __GLXDRIdrawable base; - - GC gc; - GC swapgc; - - __DRIdrawable *driDrawable; - XVisualInfo *visinfo; - XImage *ximage; -}; +#include "drisw_priv.h" +#include +#include static Bool -XCreateDrawable(struct drisw_drawable * pdp, - Display * dpy, XID drawable, int visualid) +XCreateGCs(struct drisw_drawable * pdp, + Display * dpy, XID drawable, int visualid) { XGCValues gcvalues; long visMask; @@ -95,15 +58,78 @@ XCreateDrawable(struct drisw_drawable * pdp, if (!pdp->visinfo || num_visuals == 0) return False; - /* create XImage */ - pdp->ximage = XCreateImage(dpy, - pdp->visinfo->visual, - pdp->visinfo->depth, - ZPixmap, 0, /* format, offset */ - NULL, /* data */ - 0, 0, /* width, height */ - 32, /* bitmap_pad */ - 0); /* bytes_per_line */ + return True; +} + +static int xshm_error = 0; +static int xshm_opcode = -1; + +/** + * Catches potential Xlib errors. + */ +static int +handle_xerror(Display *dpy, XErrorEvent *event) +{ + (void) dpy; + + assert(xshm_opcode != -1); + if (event->request_code != xshm_opcode || + event->minor_code != X_ShmAttach) + return 0; + + xshm_error = 1; + return 0; +} + +static Bool +XCreateDrawable(struct drisw_drawable * pdp, int shmid, Display * dpy) +{ + if (pdp->ximage) { + XDestroyImage(pdp->ximage); + pdp->ximage = NULL; + } + + if (!xshm_error && shmid >= 0) { + pdp->shminfo.shmid = shmid; + pdp->ximage = XShmCreateImage(dpy, + pdp->visinfo->visual, + pdp->visinfo->depth, + ZPixmap, /* format */ + NULL, /* data */ + &pdp->shminfo, /* shminfo */ + 0, 0); /* width, height */ + if (pdp->ximage != NULL) { + int (*old_handler)(Display *, XErrorEvent *); + + /* dispatch pending errors */ + XSync(dpy, False); + + old_handler = XSetErrorHandler(handle_xerror); + /* This may trigger the X protocol error we're ready to catch: */ + XShmAttach(dpy, &pdp->shminfo); + XSync(dpy, False); + + if (xshm_error) { + /* we are on a remote display, this error is normal, don't print it */ + XDestroyImage(pdp->ximage); + pdp->ximage = NULL; + } + + (void) XSetErrorHandler(old_handler); + } + } + + if (pdp->ximage == NULL) { + pdp->shminfo.shmid = -1; + pdp->ximage = XCreateImage(dpy, + pdp->visinfo->visual, + pdp->visinfo->depth, + ZPixmap, 0, /* format, offset */ + NULL, /* data */ + 0, 0, /* width, height */ + 32, /* bitmap_pad */ + 0); /* bytes_per_line */ + } /** * swrast does not handle 24-bit depth with 24 bpp, so let X do the @@ -118,7 +144,9 @@ XCreateDrawable(struct drisw_drawable * pdp, static void XDestroyDrawable(struct drisw_drawable * pdp, Display * dpy, XID drawable) { - XDestroyImage(pdp->ximage); + if (pdp->ximage) + XDestroyImage(pdp->ximage); + free(pdp->visinfo); XFreeGC(dpy, pdp->gc); @@ -172,9 +200,9 @@ bytes_per_line(unsigned pitch_bits, unsigned mul) } static void -swrastPutImage2(__DRIdrawable * draw, int op, +swrastXPutImage(__DRIdrawable * draw, int op, int x, int y, int w, int h, int stride, - char *data, void *loaderPrivate) + int shmid, char *data, void *loaderPrivate) { struct drisw_drawable *pdp = loaderPrivate; __GLXDRIdrawable *pdraw = &(pdp->base); @@ -183,6 +211,11 @@ swrastPutImage2(__DRIdrawable * draw, int op, XImage *ximage; GC gc; + if (!pdp->ximage || shmid != pdp->shminfo.shmid) { + if (!XCreateDrawable(pdp, shmid, dpy)) + return; + } + switch (op) { case __DRI_SWRAST_IMAGE_OP_DRAW: gc = pdp->gc; @@ -195,30 +228,58 @@ swrastPutImage2(__DRIdrawable * draw, int op, } drawable = pdraw->xDrawable; - ximage = pdp->ximage; - ximage->data = data; - ximage->width = w; - ximage->height = h; ximage->bytes_per_line = stride ? stride : bytes_per_line(w * ximage->bits_per_pixel, 32); + ximage->data = data; - XPutImage(dpy, drawable, gc, ximage, 0, 0, x, y, w, h); - + if (pdp->shminfo.shmid >= 0) { + ximage->width = ximage->bytes_per_line / ((ximage->bits_per_pixel + 7)/ 8); + ximage->height = h; + XShmPutImage(dpy, drawable, gc, ximage, 0, 0, x, y, w, h, False); + XSync(dpy, False); + } else { + ximage->width = w; + ximage->height = h; + XPutImage(dpy, drawable, gc, ximage, 0, 0, x, y, w, h); + } ximage->data = NULL; } +static void +swrastPutImageShm(__DRIdrawable * draw, int op, + int x, int y, int w, int h, int stride, + int shmid, char *shmaddr, unsigned offset, + void *loaderPrivate) +{ + struct drisw_drawable *pdp = loaderPrivate; + + pdp->shminfo.shmaddr = shmaddr; + swrastXPutImage(draw, op, x, y, w, h, stride, shmid, + shmaddr + offset, loaderPrivate); +} + +static void +swrastPutImage2(__DRIdrawable * draw, int op, + int x, int y, int w, int h, int stride, + char *data, void *loaderPrivate) +{ + swrastXPutImage(draw, op, x, y, w, h, stride, -1, + data, loaderPrivate); +} + static void swrastPutImage(__DRIdrawable * draw, int op, int x, int y, int w, int h, char *data, void *loaderPrivate) { - swrastPutImage2(draw, op, x, y, w, h, 0, data, loaderPrivate); + swrastXPutImage(draw, op, x, y, w, h, 0, -1, + data, loaderPrivate); } static void -swrastGetImage(__DRIdrawable * read, - int x, int y, int w, int h, - char *data, void *loaderPrivate) +swrastGetImage2(__DRIdrawable * read, + int x, int y, int w, int h, int stride, + char *data, void *loaderPrivate) { struct drisw_drawable *prp = loaderPrivate; __GLXDRIdrawable *pread = &(prp->base); @@ -226,30 +287,86 @@ swrastGetImage(__DRIdrawable * read, Drawable readable; XImage *ximage; + if (!prp->ximage || prp->shminfo.shmid >= 0) { + if (!XCreateDrawable(prp, -1, dpy)) + return; + } + readable = pread->xDrawable; ximage = prp->ximage; ximage->data = data; ximage->width = w; ximage->height = h; - ximage->bytes_per_line = bytes_per_line(w * ximage->bits_per_pixel, 32); + ximage->bytes_per_line = stride ? stride : bytes_per_line(w * ximage->bits_per_pixel, 32); XGetSubImage(dpy, readable, x, y, w, h, ~0L, ZPixmap, ximage, 0, 0); ximage->data = NULL; } +static void +swrastGetImage(__DRIdrawable * read, + int x, int y, int w, int h, + char *data, void *loaderPrivate) +{ + swrastGetImage2(read, x, y, w, h, 0, data, loaderPrivate); +} + +static void +swrastGetImageShm(__DRIdrawable * read, + int x, int y, int w, int h, + int shmid, void *loaderPrivate) +{ + struct drisw_drawable *prp = loaderPrivate; + __GLXDRIdrawable *pread = &(prp->base); + Display *dpy = pread->psc->dpy; + Drawable readable; + XImage *ximage; + + if (!prp->ximage || shmid != prp->shminfo.shmid) { + if (!XCreateDrawable(prp, shmid, dpy)) + return; + } + readable = pread->xDrawable; + + ximage = prp->ximage; + ximage->data = prp->shminfo.shmaddr; /* no offset */ + ximage->width = w; + ximage->height = h; + ximage->bytes_per_line = bytes_per_line(w * ximage->bits_per_pixel, 32); + + XShmGetImage(dpy, readable, ximage, x, y, ~0L); +} + +static const __DRIswrastLoaderExtension swrastLoaderExtension_shm = { + .base = {__DRI_SWRAST_LOADER, 4 }, + + .getDrawableInfo = swrastGetDrawableInfo, + .putImage = swrastPutImage, + .getImage = swrastGetImage, + .putImage2 = swrastPutImage2, + .getImage2 = swrastGetImage2, + .putImageShm = swrastPutImageShm, + .getImageShm = swrastGetImageShm, +}; + +static const __DRIextension *loader_extensions_shm[] = { + &swrastLoaderExtension_shm.base, + NULL +}; + static const __DRIswrastLoaderExtension swrastLoaderExtension = { - .base = {__DRI_SWRAST_LOADER, 2 }, + .base = {__DRI_SWRAST_LOADER, 3 }, .getDrawableInfo = swrastGetDrawableInfo, .putImage = swrastPutImage, .getImage = swrastGetImage, .putImage2 = swrastPutImage2, + .getImage2 = swrastGetImage2, }; -static const __DRIextension *loader_extensions[] = { - &systemTimeExtension.base, +static const __DRIextension *loader_extensions_noshm[] = { &swrastLoaderExtension.base, NULL }; @@ -286,11 +403,9 @@ drisw_bind_context(struct glx_context *context, struct glx_context *old, driReleaseDrawables(&pcp->base); - if (pdraw == NULL || pread == NULL) - return GLXBadDrawable; - if ((*psc->core->bindContext) (pcp->driContext, - pdraw->driDrawable, pread->driDrawable)) + pdraw ? pdraw->driDrawable : NULL, + pread ? pread->driDrawable : NULL)) return Success; return GLXBadContext; @@ -448,7 +563,8 @@ drisw_create_context_attribs(struct glx_screen *base, uint32_t flags; unsigned api; int reset; - uint32_t ctx_attribs[2 * 4]; + int release; + uint32_t ctx_attribs[2 * 5]; unsigned num_ctx_attribs = 0; if (!psc->base.driScreen) @@ -461,7 +577,7 @@ drisw_create_context_attribs(struct glx_screen *base, */ if (!dri2_convert_glx_attribs(num_attribs, attribs, &major_ver, &minor_ver, &renderType, &flags, - &api, &reset, error)) + &api, &reset, &release, error)) return NULL; /* Check the renderType value */ @@ -472,6 +588,10 @@ drisw_create_context_attribs(struct glx_screen *base, if (reset != __DRI_CTX_RESET_NO_NOTIFICATION) return NULL; + if (release != __DRI_CTX_RELEASE_BEHAVIOR_FLUSH && + release != __DRI_CTX_RELEASE_BEHAVIOR_NONE) + return NULL; + if (shareList) { pcp_shared = (struct drisw_context *) shareList; shared = pcp_shared->driContext; @@ -481,7 +601,7 @@ drisw_create_context_attribs(struct glx_screen *base, if (pcp == NULL) return NULL; - if (!glx_context_init(&pcp->base, &psc->base, &config->base)) { + if (!glx_context_init(&pcp->base, &psc->base, config_base)) { free(pcp); return NULL; } @@ -490,6 +610,10 @@ drisw_create_context_attribs(struct glx_screen *base, ctx_attribs[num_ctx_attribs++] = major_ver; ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MINOR_VERSION; ctx_attribs[num_ctx_attribs++] = minor_ver; + if (release != __DRI_CTX_RELEASE_BEHAVIOR_FLUSH) { + ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_RELEASE_BEHAVIOR; + ctx_attribs[num_ctx_attribs++] = release; + } if (flags != 0) { ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_FLAGS; @@ -505,7 +629,7 @@ drisw_create_context_attribs(struct glx_screen *base, pcp->driContext = (*psc->swrast->createContextAttribs) (psc->driScreen, api, - config->driConfig, + config ? config->driConfig : 0, shared, num_ctx_attribs / 2, ctx_attribs, @@ -551,7 +675,7 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable, pdp->base.drawable = drawable; pdp->base.psc = &psc->base; - ret = XCreateDrawable(pdp, psc->base.dpy, xDrawable, modes->visualID); + ret = XCreateGCs(pdp, psc->base.dpy, xDrawable, modes->visualID); if (!ret) { free(pdp); return NULL; @@ -638,8 +762,8 @@ driOpenSwrast(void) static const struct glx_screen_vtable drisw_screen_vtable = { .create_context = drisw_create_context, .create_context_attribs = drisw_create_context_attribs, - .query_renderer_integer = NULL, - .query_renderer_string = NULL, + .query_renderer_integer = drisw_query_renderer_integer, + .query_renderer_string = drisw_query_renderer_string, }; static void @@ -653,8 +777,10 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions) __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context"); __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_profile"); - /* DRISW version >= 2 implies support for OpenGL ES 2.0. + /* DRISW version >= 2 implies support for OpenGL ES. */ + __glXEnableDirectExtension(&psc->base, + "GLX_EXT_create_context_es_profile"); __glXEnableDirectExtension(&psc->base, "GLX_EXT_create_context_es2_profile"); } @@ -668,9 +794,29 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions) psc->texBuffer = (__DRItexBufferExtension *) extensions[i]; __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap"); } + /* DRISW version 3 is also required because GLX_MESA_query_renderer + * requires GLX_ARB_create_context_profile. + */ + if (psc->swrast->base.version >= 3 + && strcmp(extensions[i]->name, __DRI2_RENDERER_QUERY) == 0) { + psc->rendererQuery = (__DRI2rendererQueryExtension *) extensions[i]; + __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer"); + } + if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0) { + __glXEnableDirectExtension(&psc->base, + "GLX_ARB_context_flush_control"); + } } } +static int +check_xshm(Display *dpy) +{ + int ignore; + + return XQueryExtension(dpy, "MIT-SHM", &xshm_opcode, &ignore, &ignore); +} + static struct glx_screen * driswCreateScreen(int screen, struct glx_display *priv) { @@ -680,6 +826,7 @@ driswCreateScreen(int screen, struct glx_display *priv) struct drisw_screen *psc; struct glx_config *configs = NULL, *visuals = NULL; int i; + const __DRIextension **loader_extensions_local; psc = calloc(1, sizeof *psc); if (psc == NULL) @@ -698,6 +845,11 @@ driswCreateScreen(int screen, struct glx_display *priv) if (extensions == NULL) goto handle_error; + if (!check_xshm(psc->base.dpy)) + loader_extensions_local = loader_extensions_noshm; + else + loader_extensions_local = loader_extensions_shm; + for (i = 0; extensions[i]; i++) { if (strcmp(extensions[i]->name, __DRI_CORE) == 0) psc->core = (__DRIcoreExtension *) extensions[i]; @@ -714,12 +866,12 @@ driswCreateScreen(int screen, struct glx_display *priv) if (psc->swrast->base.version >= 4) { psc->driScreen = - psc->swrast->createNewScreen2(screen, loader_extensions, + psc->swrast->createNewScreen2(screen, loader_extensions_local, extensions, &driver_configs, psc); } else { psc->driScreen = - psc->swrast->createNewScreen(screen, loader_extensions, + psc->swrast->createNewScreen(screen, loader_extensions_local, &driver_configs, psc); } if (psc->driScreen == NULL) {