*
**************************************************************************/
-/* TODO:
- *
- * xshm / EGLImage:
- *
- * Allow the loaders to use the XSHM extension. It probably requires callbacks
- * for createImage/destroyImage similar to DRI2 getBuffers.
- */
-
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_box.h"
#include "dri_screen.h"
#include "dri_context.h"
#include "dri_drawable.h"
+#include "dri_helpers.h"
#include "dri_query_renderer.h"
DEBUG_GET_ONCE_BOOL_OPTION(swrast_no_present, "SWRAST_NO_PRESENT", FALSE);
-static boolean swrast_no_present = FALSE;
static inline void
get_drawable_info(__DRIdrawable *dPriv, int *x, int *y, int *w, int *h)
data, dPriv->loaderPrivate);
}
+static inline void
+put_image_shm(__DRIdrawable *dPriv, int shmid, char *shmaddr,
+ unsigned offset, unsigned offset_x, int x, int y,
+ unsigned width, unsigned height, unsigned stride)
+{
+ __DRIscreen *sPriv = dPriv->driScreenPriv;
+ const __DRIswrastLoaderExtension *loader = sPriv->swrast_loader;
+
+ /* if we have the newer interface, don't have to add the offset_x here. */
+ if (loader->base.version > 4 && loader->putImageShm2)
+ loader->putImageShm2(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,
+ x, y, width, height, stride,
+ shmid, shmaddr, offset, dPriv->loaderPrivate);
+ else
+ loader->putImageShm(dPriv, __DRI_SWRAST_IMAGE_OP_SWAP,
+ x, y, width, height, stride,
+ shmid, shmaddr, offset + offset_x, dPriv->loaderPrivate);
+}
+
static inline void
get_image(__DRIdrawable *dPriv, int x, int y, int width, int height, void *data)
{
data, dPriv->loaderPrivate);
}
+static inline bool
+get_image_shm(__DRIdrawable *dPriv, int x, int y, int width, int height,
+ struct pipe_resource *res)
+{
+ __DRIscreen *sPriv = dPriv->driScreenPriv;
+ const __DRIswrastLoaderExtension *loader = sPriv->swrast_loader;
+ struct winsys_handle whandle;
+
+ whandle.type = WINSYS_HANDLE_TYPE_SHMID;
+
+ if (loader->base.version < 4 || !loader->getImageShm)
+ return FALSE;
+
+ if (!res->screen->resource_get_handle(res->screen, NULL, res, &whandle, PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE))
+ return FALSE;
+
+ if (loader->base.version > 5 && loader->getImageShm2)
+ return loader->getImageShm2(dPriv, x, y, width, height, whandle.handle, dPriv->loaderPrivate);
+
+ loader->getImageShm(dPriv, x, y, width, height, whandle.handle, dPriv->loaderPrivate);
+ return TRUE;
+}
+
static void
drisw_update_drawable_info(struct dri_drawable *drawable)
{
put_image2(dPriv, data, x, y, width, height, stride);
}
+static inline void
+drisw_put_image_shm(struct dri_drawable *drawable,
+ int shmid, char *shmaddr, unsigned offset,
+ unsigned offset_x,
+ int x, int y, unsigned width, unsigned height,
+ unsigned stride)
+{
+ __DRIdrawable *dPriv = drawable->dPriv;
+
+ put_image_shm(dPriv, shmid, shmaddr, offset, offset_x, x, y, width, height, stride);
+}
+
static inline void
drisw_present_texture(__DRIdrawable *dPriv,
struct pipe_resource *ptex, struct pipe_box *sub_box)
struct dri_drawable *drawable = dri_drawable(dPriv);
struct dri_screen *screen = dri_screen(drawable->sPriv);
- if (swrast_no_present)
+ if (screen->swrast_no_present)
return;
screen->base.screen->flush_frontbuffer(screen->base.screen, ptex, 0, 0, drawable, sub_box);
if (ctx->pp)
pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]);
- ctx->st->flush(ctx->st, ST_FLUSH_FRONT, NULL);
+ if (ctx->hud)
+ hud_run(ctx->hud, ctx->st->cso_context, ptex);
+
+ ctx->st->flush(ctx->st, ST_FLUSH_FRONT, NULL, NULL, NULL);
+
+ if (drawable->stvis.samples > 1) {
+ /* Resolve the back buffer. */
+ dri_pipe_blit(ctx->st->pipe,
+ drawable->textures[ST_ATTACHMENT_BACK_LEFT],
+ drawable->msaa_textures[ST_ATTACHMENT_BACK_LEFT]);
+ }
drisw_copy_to_front(dPriv, ptex);
}
if (ctx->pp && drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL])
pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]);
- ctx->st->flush(ctx->st, ST_FLUSH_FRONT, NULL);
+ ctx->st->flush(ctx->st, ST_FLUSH_FRONT, NULL, NULL, NULL);
u_box_2d(x, dPriv->h - y - h, w, h, &box);
drisw_present_texture(dPriv, ptex, &box);
if (!ctx)
return;
+ if (drawable->stvis.samples > 1) {
+ /* Resolve the front buffer. */
+ dri_pipe_blit(ctx->st->pipe,
+ drawable->textures[ST_ATTACHMENT_FRONT_LEFT],
+ drawable->msaa_textures[ST_ATTACHMENT_FRONT_LEFT]);
+ }
ptex = drawable->textures[statt];
if (ptex) {
/* remove outdated textures */
if (resized) {
- for (i = 0; i < ST_ATTACHMENT_COUNT; i++)
+ for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
pipe_resource_reference(&drawable->textures[i], NULL);
+ pipe_resource_reference(&drawable->msaa_textures[i], NULL);
+ }
}
memset(&templ, 0, sizeof(templ));
dri_drawable_get_format(drawable, statts[i], &format, &bind);
/* if we don't do any present, no need for display targets */
- if (statts[i] != ST_ATTACHMENT_DEPTH_STENCIL && !swrast_no_present)
- bind |= PIPE_BIND_DISPLAY_TARGET;
+ if (statts[i] != ST_ATTACHMENT_DEPTH_STENCIL && !screen->swrast_no_present)
+ bind |= PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_LINEAR;
if (format == PIPE_FORMAT_NONE)
continue;
templ.format = format;
templ.bind = bind;
+ templ.nr_samples = 0;
+ templ.nr_storage_samples = 0;
if (statts[i] == ST_ATTACHMENT_FRONT_LEFT &&
screen->base.screen->resource_create_front &&
} else
drawable->textures[statts[i]] =
screen->base.screen->resource_create(screen->base.screen, &templ);
+
+ if (drawable->stvis.samples > 1) {
+ templ.bind = templ.bind &
+ ~(PIPE_BIND_SCANOUT | PIPE_BIND_SHARED | PIPE_BIND_DISPLAY_TARGET);
+ templ.nr_samples = drawable->stvis.samples;
+ templ.nr_storage_samples = drawable->stvis.samples;
+ drawable->msaa_textures[statts[i]] =
+ screen->base.screen->resource_create(screen->base.screen, &templ);
+
+ dri_pipe_blit(stctx->st->pipe,
+ drawable->msaa_textures[statts[i]],
+ drawable->textures[statts[i]]);
+ }
}
drawable->old_w = width;
x, y, w, h, &transfer);
/* Copy the Drawable content to the mapped texture buffer */
- get_image(dPriv, x, y, w, h, map);
+ if (!get_image_shm(dPriv, x, y, w, h, res))
+ get_image(dPriv, x, y, w, h, map);
/* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
get_image() has a pitch rounded up to 4 bytes. */
pipe_transfer_unmap(pipe, transfer);
}
+static __DRIimageExtension driSWImageExtension = {
+ .base = { __DRI_IMAGE, 6 },
+
+ .createImageFromRenderbuffer = dri2_create_image_from_renderbuffer,
+ .createImageFromTexture = dri2_create_from_texture,
+ .destroyImage = dri2_destroy_image,
+};
+
/*
* Backend function for init_screen.
*/
&driTexBufferExtension.base,
&dri2RendererQueryExtension.base,
&dri2ConfigQueryExtension.base,
+ &dri2FenceExtension.base,
+ &dri2NoErrorExtension.base,
+ &driSWImageExtension.base,
+ &dri2FlushControlExtension.base,
NULL
};
-static struct drisw_loader_funcs drisw_lf = {
+static const struct drisw_loader_funcs drisw_lf = {
.get_image = drisw_get_image,
.put_image = drisw_put_image,
.put_image2 = drisw_put_image2
};
+static const struct drisw_loader_funcs drisw_shm_lf = {
+ .get_image = drisw_get_image,
+ .put_image = drisw_put_image,
+ .put_image2 = drisw_put_image2,
+ .put_image_shm = drisw_put_image_shm
+};
+
static const __DRIconfig **
drisw_init_screen(__DRIscreen * sPriv)
{
+ const __DRIswrastLoaderExtension *loader = sPriv->swrast_loader;
const __DRIconfig **configs;
struct dri_screen *screen;
struct pipe_screen *pscreen = NULL;
+ const struct drisw_loader_funcs *lf = &drisw_lf;
screen = CALLOC_STRUCT(dri_screen);
if (!screen)
screen->sPriv = sPriv;
screen->fd = -1;
- swrast_no_present = debug_get_option_swrast_no_present();
+ screen->swrast_no_present = debug_get_option_swrast_no_present();
sPriv->driverPrivate = (void *)screen;
sPriv->extensions = drisw_screen_extensions;
+ if (loader->base.version >= 4) {
+ if (loader->putImageShm)
+ lf = &drisw_shm_lf;
+ }
+
+ if (pipe_loader_sw_probe_dri(&screen->dev, lf)) {
+ dri_init_options(screen);
- if (pipe_loader_sw_probe_dri(&screen->dev, &drisw_lf))
pscreen = pipe_loader_create_screen(screen->dev);
+ }
if (!pscreen)
goto fail;
- configs = dri_init_screen_helper(screen, pscreen, "swrast");
+ configs = dri_init_screen_helper(screen, pscreen);
if (!configs)
goto fail;
+ screen->lookup_egl_image = dri2_lookup_egl_image;
+
return configs;
fail:
dri_destroy_screen_helper(screen);
projects / mesa.git / blobdiff