#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+#include <xcb/xproto.h>
+#include <xcb/shm.h>
#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
#include "glxclient.h"
#include <dlfcn.h>
#include "dri_common.h"
#include "drisw_priv.h"
+#include <X11/extensions/shmproto.h>
+#include <assert.h>
+
+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)
+ return 0;
+
+ xshm_error = event->error_code;
+ return 0;
+}
static Bool
-XCreateDrawable(struct drisw_drawable * pdp,
- Display * dpy, XID drawable, int visualid)
+XCreateDrawable(struct drisw_drawable * pdp, int shmid, Display * dpy)
{
- XGCValues gcvalues;
- long visMask;
- XVisualInfo visTemp;
- int num_visuals;
-
- /* create GC's */
- pdp->gc = XCreateGC(dpy, drawable, 0, NULL);
- pdp->swapgc = XCreateGC(dpy, drawable, 0, NULL);
-
- gcvalues.function = GXcopy;
- gcvalues.graphics_exposures = False;
- XChangeGC(dpy, pdp->gc, GCFunction, &gcvalues);
- XChangeGC(dpy, pdp->swapgc, GCFunction, &gcvalues);
- XChangeGC(dpy, pdp->swapgc, GCGraphicsExposures, &gcvalues);
-
- /* visual */
- visTemp.visualid = visualid;
- visMask = VisualIDMask;
- pdp->visinfo = XGetVisualInfo(dpy, visMask, &visTemp, &num_visuals);
-
- if (!pdp->visinfo || num_visuals == 0)
- return False;
+ if (pdp->ximage) {
+ XDestroyImage(pdp->ximage);
+ pdp->ximage = NULL;
+ if ((pdp->shminfo.shmid > 0) && (shmid != pdp->shminfo.shmid))
+ XShmDetach(dpy, &pdp->shminfo);
+ }
+
+ if (!xshm_error && shmid >= 0) {
+ pdp->shminfo.shmid = shmid;
+ pdp->ximage = XShmCreateImage(dpy,
+ NULL,
+ pdp->xDepth,
+ 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);
+ }
+ }
- /* 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 */
+ if (pdp->ximage == NULL) {
+ pdp->shminfo.shmid = -1;
+ pdp->ximage = XCreateImage(dpy,
+ NULL,
+ pdp->xDepth,
+ 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
static void
XDestroyDrawable(struct drisw_drawable * pdp, Display * dpy, XID drawable)
{
- XDestroyImage(pdp->ximage);
- free(pdp->visinfo);
+ if (pdp->ximage)
+ XDestroyImage(pdp->ximage);
+
+ if (pdp->shminfo.shmid > 0)
+ XShmDetach(dpy, &pdp->shminfo);
XFreeGC(dpy, pdp->gc);
- XFreeGC(dpy, pdp->swapgc);
}
/**
}
static void
-swrastPutImage2(__DRIdrawable * draw, int op,
- int x, int y, int w, int h, int stride,
- char *data, void *loaderPrivate)
+swrastXPutImage(__DRIdrawable * draw, int op,
+ int srcx, int srcy, int x, int y,
+ int w, int h, int stride,
+ int shmid, char *data, void *loaderPrivate)
{
struct drisw_drawable *pdp = loaderPrivate;
__GLXDRIdrawable *pdraw = &(pdp->base);
Display *dpy = pdraw->psc->dpy;
Drawable drawable;
XImage *ximage;
- GC gc;
+ GC gc = pdp->gc;
- switch (op) {
- case __DRI_SWRAST_IMAGE_OP_DRAW:
- gc = pdp->gc;
- break;
- case __DRI_SWRAST_IMAGE_OP_SWAP:
- gc = pdp->swapgc;
- break;
- default:
- return;
+ if (!pdp->ximage || shmid != pdp->shminfo.shmid) {
+ if (!XCreateDrawable(pdp, shmid, dpy))
+ return;
}
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);
+ ximage->width = ximage->bytes_per_line / ((ximage->bits_per_pixel + 7)/ 8);
+ ximage->height = h;
+ if (pdp->shminfo.shmid >= 0) {
+ XShmPutImage(dpy, drawable, gc, ximage, srcx, srcy, x, y, w, h, False);
+ XSync(dpy, False);
+ } else {
+ XPutImage(dpy, drawable, gc, ximage, srcx, srcy, 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, 0, 0, x, y, w, h, stride, shmid,
+ shmaddr + offset, loaderPrivate);
+}
+
+static void
+swrastPutImageShm2(__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, 0, 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, 0, 0, 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, 0, 0, x, y, w, h, 0, -1,
+ data, loaderPrivate);
+}
+
+static void
+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);
+ Display *dpy = pread->psc->dpy;
+ 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 = 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 GLboolean
+swrastGetImageShm2(__DRIdrawable * read,
+ int x, int y, int w, int h,
+ int shmid, void *loaderPrivate)
{
struct drisw_drawable *prp = loaderPrivate;
__GLXDRIdrawable *pread = &(prp->base);
Drawable readable;
XImage *ximage;
+ if (!prp->ximage || shmid != prp->shminfo.shmid) {
+ if (!XCreateDrawable(prp, shmid, dpy))
+ return GL_FALSE;
+ }
+
+ if (prp->shminfo.shmid == -1)
+ return GL_FALSE;
readable = pread->xDrawable;
ximage = prp->ximage;
- ximage->data = data;
+ 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);
- XGetSubImage(dpy, readable, x, y, w, h, ~0L, ZPixmap, ximage, 0, 0);
+ XShmGetImage(dpy, readable, ximage, x, y, ~0L);
+ return GL_TRUE;
+}
- ximage->data = NULL;
+static void
+swrastGetImageShm(__DRIdrawable * read,
+ int x, int y, int w, int h,
+ int shmid, void *loaderPrivate)
+{
+ swrastGetImageShm2(read, x, y, w, h, shmid, loaderPrivate);
}
+static const __DRIswrastLoaderExtension swrastLoaderExtension_shm = {
+ .base = {__DRI_SWRAST_LOADER, 6 },
+
+ .getDrawableInfo = swrastGetDrawableInfo,
+ .putImage = swrastPutImage,
+ .getImage = swrastGetImage,
+ .putImage2 = swrastPutImage2,
+ .getImage2 = swrastGetImage2,
+ .putImageShm = swrastPutImageShm,
+ .getImageShm = swrastGetImageShm,
+ .putImageShm2 = swrastPutImageShm2,
+ .getImageShm2 = swrastGetImageShm2,
+};
+
+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
};
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;
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)
*/
if (!dri2_convert_glx_attribs(num_attribs, attribs,
&major_ver, &minor_ver, &renderType, &flags,
- &api, &reset, error))
+ &api, &reset, &release, error))
+ return NULL;
+
+ if (!dri2_check_no_error(flags, shareList, major_ver, error))
return NULL;
/* Check the renderType value */
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;
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;
}
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;
* GLX_CONTEXT_*_BIT values.
*/
ctx_attribs[num_ctx_attribs++] = flags;
+
+ if (flags & __DRI_CTX_FLAG_NO_ERROR)
+ pcp->base.noError = GL_TRUE;
}
pcp->base.renderType = renderType;
pcp->driContext =
(*psc->swrast->createContextAttribs) (psc->driScreen,
api,
- config->driConfig,
+ config ? config->driConfig : 0,
shared,
num_ctx_attribs / 2,
ctx_attribs,
struct drisw_drawable *pdp;
__GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) modes;
struct drisw_screen *psc = (struct drisw_screen *) base;
- Bool ret;
const __DRIswrastExtension *swrast = psc->swrast;
+ Display *dpy = psc->base.dpy;
pdp = calloc(1, sizeof(*pdp));
if (!pdp)
pdp->base.xDrawable = xDrawable;
pdp->base.drawable = drawable;
pdp->base.psc = &psc->base;
+ pdp->config = modes;
+ pdp->gc = XCreateGC(dpy, xDrawable, 0, NULL);
+ pdp->xDepth = 0;
+
+ /* Use the visual depth, if this fbconfig corresponds to a visual */
+ if (pdp->config->visualID != 0) {
+ int matches = 0;
+ XVisualInfo *visinfo, template;
+
+ template.visualid = pdp->config->visualID;
+ template.screen = pdp->config->screen;
+ visinfo = XGetVisualInfo(dpy, VisualIDMask | VisualScreenMask,
+ &template, &matches);
+
+ if (visinfo && matches) {
+ pdp->xDepth = visinfo->depth;
+ XFree(visinfo);
+ }
+ }
- ret = XCreateDrawable(pdp, psc->base.dpy, xDrawable, modes->visualID);
- if (!ret) {
- free(pdp);
- return NULL;
+ /* Otherwise, or if XGetVisualInfo failed, ask the server */
+ if (pdp->xDepth == 0) {
+ Window root;
+ int x, y;
+ unsigned uw, uh, bw, depth;
+
+ XGetGeometry(dpy, xDrawable, &root, &x, &y, &uw, &uh, &bw, &depth);
+ pdp->xDepth = depth;
}
/* Create a new drawable */
#define SWRAST_DRIVER_NAME "swrast"
-static void *
-driOpenSwrast(void)
-{
- void *driver = NULL;
-
- if (driver == NULL)
- driver = driOpenDriver(SWRAST_DRIVER_NAME);
-
- return driver;
-}
-
static const struct glx_screen_vtable drisw_screen_vtable = {
.create_context = drisw_create_context,
.create_context_attribs = drisw_create_context_attribs,
__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");
}
psc->rendererQuery = (__DRI2rendererQueryExtension *) extensions[i];
__glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
}
+
+ if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
+ __glXEnableDirectExtension(&psc->base,
+ "GLX_ARB_create_context_robustness");
+
+ if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0) {
+ __glXEnableDirectExtension(&psc->base,
+ "GLX_ARB_context_flush_control");
+ }
+ }
+}
+
+static int
+check_xshm(Display *dpy)
+{
+ xcb_connection_t *c = XGetXCBConnection(dpy);
+ xcb_void_cookie_t cookie;
+ xcb_generic_error_t *error;
+ int ret = True;
+ int ignore;
+
+ if (!XQueryExtension(dpy, "MIT-SHM", &xshm_opcode, &ignore, &ignore))
+ return False;
+
+ cookie = xcb_shm_detach_checked(c, 0);
+ if ((error = xcb_request_check(c, cookie))) {
+ /* BadRequest means we're a remote client. If we were local we'd
+ * expect BadValue since 'info' has an invalid segment name.
+ */
+ if (error->error_code == BadRequest)
+ ret = False;
+ free(error);
}
+
+ return ret;
}
static struct glx_screen *
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)
return NULL;
}
- psc->driver = driOpenSwrast();
- if (psc->driver == NULL)
- goto handle_error;
-
- extensions = driGetDriverExtensions(psc->driver, SWRAST_DRIVER_NAME);
+ extensions = driOpenDriver(SWRAST_DRIVER_NAME, &psc->driver);
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];
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) {
projects / mesa.git / blobdiff