X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2Floader_dri3_helper.c;h=19ab58151009409bd84220cf35b5ff59e1505d96;hb=109de3049dda6be2a5a3910f777feea0bbf9ce92;hp=62bfe845c08d9d07c1db22bc1759c440bdf66dc3;hpb=bd6131a8d1e1cf0e6eb5494b50607a4ccb21e1f9;p=mesa.git diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c index 62bfe845c08..19ab5815100 100644 --- a/src/loader/loader_dri3_helper.c +++ b/src/loader/loader_dri3_helper.c @@ -32,6 +32,7 @@ #include +#include #include "loader_dri3_helper.h" /* From xmlpool/options.h, user exposed so should be stable */ @@ -40,6 +41,127 @@ #define DRI_CONF_VBLANK_DEF_INTERVAL_1 2 #define DRI_CONF_VBLANK_ALWAYS_SYNC 3 +/** + * A cached blit context. + */ +struct loader_dri3_blit_context { + mtx_t mtx; + __DRIcontext *ctx; + __DRIscreen *cur_screen; + const __DRIcoreExtension *core; +}; + +/* For simplicity we maintain the cache only for a single screen at a time */ +static struct loader_dri3_blit_context blit_context = { + _MTX_INITIALIZER_NP, NULL +}; + +static void +dri3_flush_present_events(struct loader_dri3_drawable *draw); + +static struct loader_dri3_buffer * +dri3_find_back_alloc(struct loader_dri3_drawable *draw); + +/** + * Do we have blit functionality in the image blit extension? + * + * \param draw[in] The drawable intended to blit from / to. + * \return true if we have blit functionality. false otherwise. + */ +static bool loader_dri3_have_image_blit(const struct loader_dri3_drawable *draw) +{ + return draw->ext->image->base.version >= 9 && + draw->ext->image->blitImage != NULL; +} + +/** + * Get and lock (for use with the current thread) a dri context associated + * with the drawable's dri screen. The context is intended to be used with + * the dri image extension's blitImage method. + * + * \param draw[in] Pointer to the drawable whose dri screen we want a + * dri context for. + * \return A dri context or NULL if context creation failed. + * + * When the caller is done with the context (even if the context returned was + * NULL), the caller must call loader_dri3_blit_context_put. + */ +static __DRIcontext * +loader_dri3_blit_context_get(struct loader_dri3_drawable *draw) +{ + mtx_lock(&blit_context.mtx); + + if (blit_context.ctx && blit_context.cur_screen != draw->dri_screen) { + blit_context.core->destroyContext(blit_context.ctx); + blit_context.ctx = NULL; + } + + if (!blit_context.ctx) { + blit_context.ctx = draw->ext->core->createNewContext(draw->dri_screen, + NULL, NULL, NULL); + blit_context.cur_screen = draw->dri_screen; + blit_context.core = draw->ext->core; + } + + return blit_context.ctx; +} + +/** + * Release (for use with other threads) a dri context previously obtained using + * loader_dri3_blit_context_get. + */ +static void +loader_dri3_blit_context_put(void) +{ + mtx_unlock(&blit_context.mtx); +} + +/** + * Blit (parts of) the contents of a DRI image to another dri image + * + * \param draw[in] The drawable which owns the images. + * \param dst[in] The destination image. + * \param src[in] The source image. + * \param dstx0[in] Start destination coordinate. + * \param dsty0[in] Start destination coordinate. + * \param width[in] Blit width. + * \param height[in] Blit height. + * \param srcx0[in] Start source coordinate. + * \param srcy0[in] Start source coordinate. + * \param flush_flag[in] Image blit flush flag. + * \return true iff successful. + */ +static bool +loader_dri3_blit_image(struct loader_dri3_drawable *draw, + __DRIimage *dst, __DRIimage *src, + int dstx0, int dsty0, int width, int height, + int srcx0, int srcy0, int flush_flag) +{ + __DRIcontext *dri_context; + bool use_blit_context = false; + + if (!loader_dri3_have_image_blit(draw)) + return false; + + dri_context = draw->vtable->get_dri_context(draw); + + if (!dri_context || !draw->vtable->in_current_context(draw)) { + dri_context = loader_dri3_blit_context_get(draw); + use_blit_context = true; + flush_flag |= __BLIT_FLAG_FLUSH; + } + + if (dri_context) + draw->ext->image->blitImage(dri_context, dst, src, dstx0, dsty0, + width, height, srcx0, srcy0, + width, height, flush_flag); + + if (use_blit_context) + loader_dri3_blit_context_put(); + + return dri_context != NULL; +} + static inline void dri3_fence_reset(xcb_connection_t *c, struct loader_dri3_buffer *buffer) { @@ -59,31 +181,28 @@ dri3_fence_trigger(xcb_connection_t *c, struct loader_dri3_buffer *buffer) } static inline void -dri3_fence_await(xcb_connection_t *c, struct loader_dri3_buffer *buffer) +dri3_fence_await(xcb_connection_t *c, struct loader_dri3_drawable *draw, + struct loader_dri3_buffer *buffer) { xcb_flush(c); xshmfence_await(buffer->shm_fence); + if (draw) + dri3_flush_present_events(draw); } static void dri3_update_num_back(struct loader_dri3_drawable *draw) { - draw->num_back = 1; - if (draw->flipping) { - if (!draw->is_pixmap && - !(draw->present_capabilities & XCB_PRESENT_CAPABILITY_ASYNC)) - draw->num_back++; - draw->num_back++; - } - if (draw->vtable->get_swap_interval(draw) == 0) - draw->num_back++; + if (draw->flipping) + draw->num_back = 3; + else + draw->num_back = 2; } void loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval) { - interval = draw->vtable->clamp_swap_interval(draw, interval); - draw->vtable->set_swap_interval(draw, interval); + draw->swap_interval = interval; dri3_update_num_back(draw); } @@ -100,9 +219,9 @@ dri3_free_render_buffer(struct loader_dri3_drawable *draw, xcb_free_pixmap(draw->conn, buffer->pixmap); xcb_sync_destroy_fence(draw->conn, buffer->sync_fence); xshmfence_unmap_shm(buffer->shm_fence); - (draw->ext->image->destroyImage)(buffer->image); + draw->ext->image->destroyImage(buffer->image); if (buffer->linear_buffer) - (draw->ext->image->destroyImage)(buffer->linear_buffer); + draw->ext->image->destroyImage(buffer->linear_buffer); free(buffer); } @@ -111,15 +230,21 @@ loader_dri3_drawable_fini(struct loader_dri3_drawable *draw) { int i; - (draw->ext->core->destroyDrawable)(draw->dri_drawable); + draw->ext->core->destroyDrawable(draw->dri_drawable); for (i = 0; i < LOADER_DRI3_NUM_BUFFERS; i++) { if (draw->buffers[i]) dri3_free_render_buffer(draw, draw->buffers[i]); } - if (draw->special_event) + if (draw->special_event) { + xcb_void_cookie_t cookie = + xcb_present_select_input_checked(draw->conn, draw->eid, draw->drawable, + XCB_PRESENT_EVENT_MASK_NO_EVENT); + + xcb_discard_reply(draw->conn, cookie.sequence); xcb_unregister_for_special_event(draw->conn, draw->special_event); + } } int @@ -129,7 +254,7 @@ loader_dri3_drawable_init(xcb_connection_t *conn, bool is_different_gpu, const __DRIconfig *dri_config, struct loader_dri3_extensions *ext, - struct loader_dri3_vtable *vtable, + const struct loader_dri3_vtable *vtable, struct loader_dri3_drawable *draw) { xcb_get_geometry_cookie_t cookie; @@ -149,6 +274,9 @@ loader_dri3_drawable_init(xcb_connection_t *conn, draw->have_fake_front = 0; draw->first_init = true; + draw->cur_blit_source = -1; + draw->back_format = __DRI_IMAGE_FORMAT_NONE; + if (draw->ext->config) draw->ext->config->configQueryi(draw->dri_screen, "vblank_mode", &vblank_mode); @@ -164,15 +292,15 @@ loader_dri3_drawable_init(xcb_connection_t *conn, swap_interval = 1; break; } - draw->vtable->set_swap_interval(draw, swap_interval); + draw->swap_interval = swap_interval; dri3_update_num_back(draw); /* Create a new drawable */ draw->dri_drawable = - (draw->ext->image_driver->createNewDrawable)(dri_screen, - dri_config, - draw); + draw->ext->image_driver->createNewDrawable(dri_screen, + dri_config, + draw); if (!draw->dri_drawable) return 1; @@ -190,6 +318,13 @@ loader_dri3_drawable_init(xcb_connection_t *conn, draw->vtable->set_drawable_size(draw, draw->width, draw->height); free(reply); + draw->swap_method = __DRI_ATTRIB_SWAP_UNDEFINED; + if (draw->ext->core->base.version >= 2) { + (void )draw->ext->core->getConfigAttrib(dri_config, + __DRI_ATTRIB_SWAP_METHOD, + &draw->swap_method); + } + /* * Make sure server has the same swap interval we do for the new * drawable. @@ -213,6 +348,7 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, draw->width = ce->width; draw->height = ce->height; draw->vtable->set_drawable_size(draw, draw->width, draw->height); + draw->ext->flush->invalidate(draw->dri_drawable); break; } case XCB_PRESENT_COMPLETE_NOTIFY: { @@ -255,13 +391,13 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw, for (b = 0; b < sizeof(draw->buffers) / sizeof(draw->buffers[0]); b++) { struct loader_dri3_buffer *buf = draw->buffers[b]; - if (buf && buf->pixmap == ie->pixmap) { + if (buf && buf->pixmap == ie->pixmap) buf->busy = 0; - if (draw->num_back <= b && b < LOADER_DRI3_MAX_BACK) { - dri3_free_render_buffer(draw, buf); - draw->buffers[b] = NULL; - } - break; + + if (buf && draw->num_back <= b && b < LOADER_DRI3_MAX_BACK && + draw->cur_blit_source != b) { + dri3_free_render_buffer(draw, buf); + draw->buffers[b] = NULL; } } break; @@ -365,9 +501,21 @@ dri3_find_back(struct loader_dri3_drawable *draw) int b; xcb_generic_event_t *ev; xcb_present_generic_event_t *ge; + int num_to_consider = draw->num_back; + + /* Increase the likelyhood of reusing current buffer */ + dri3_flush_present_events(draw); + + /* Check whether we need to reuse the current back buffer as new back. + * In that case, wait until it's not busy anymore. + */ + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) { + num_to_consider = 1; + draw->cur_blit_source = -1; + } for (;;) { - for (b = 0; b < draw->num_back; b++) { + for (b = 0; b < num_to_consider; b++) { int id = LOADER_DRI3_BACK_ID((b + draw->cur_back) % draw->num_back); struct loader_dri3_buffer *buffer = draw->buffers[id]; @@ -467,9 +615,6 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, { struct loader_dri3_buffer *back; unsigned flags = __DRI2_FLUSH_DRAWABLE; - __DRIcontext *dri_context; - - dri_context = draw->vtable->get_dri_context(draw); /* Check we have the right attachments */ if (!draw->have_back || draw->is_pixmap) @@ -479,33 +624,27 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, flags |= __DRI2_FLUSH_CONTEXT; loader_dri3_flush(draw, flags, __DRI2_THROTTLE_SWAPBUFFER); - back = dri3_back_buffer(draw); + back = dri3_find_back_alloc(draw); + if (!back) + return; + y = draw->height - y - height; - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) { + if (draw->is_different_gpu) { /* Update the linear buffer part of the back buffer * for the dri3_copy_area operation */ - draw->ext->image->blitImage(dri_context, - back->linear_buffer, - back->image, - 0, 0, back->width, - back->height, - 0, 0, back->width, - back->height, __BLIT_FLAG_FLUSH); - /* We use blitImage to update our fake front, - */ - if (draw->have_fake_front) - draw->ext->image->blitImage(dri_context, - dri3_fake_front_buffer(draw)->image, - back->image, - x, y, width, height, - x, y, width, height, __BLIT_FLAG_FLUSH); + (void) loader_dri3_blit_image(draw, + back->linear_buffer, + back->image, + 0, 0, back->width, back->height, + 0, 0, __BLIT_FLAG_FLUSH); } + loader_dri3_swapbuffer_barrier(draw); dri3_fence_reset(draw->conn, back); dri3_copy_area(draw->conn, - dri3_back_buffer(draw)->pixmap, + back->pixmap, draw->drawable, dri3_drawable_gc(draw), x, y, x, y, width, height); @@ -513,17 +652,23 @@ loader_dri3_copy_sub_buffer(struct loader_dri3_drawable *draw, /* Refresh the fake front (if present) after we just damaged the real * front. */ - if (draw->have_fake_front && !draw->is_different_gpu) { + if (draw->have_fake_front && + !loader_dri3_blit_image(draw, + dri3_fake_front_buffer(draw)->image, + back->image, + x, y, width, height, + x, y, __BLIT_FLAG_FLUSH) && + !draw->is_different_gpu) { dri3_fence_reset(draw->conn, dri3_fake_front_buffer(draw)); dri3_copy_area(draw->conn, - dri3_back_buffer(draw)->pixmap, + back->pixmap, dri3_fake_front_buffer(draw)->pixmap, dri3_drawable_gc(draw), x, y, x, y, width, height); dri3_fence_trigger(draw->conn, dri3_fake_front_buffer(draw)); - dri3_fence_await(draw->conn, dri3_fake_front_buffer(draw)); + dri3_fence_await(draw->conn, NULL, dri3_fake_front_buffer(draw)); } - dri3_fence_await(draw->conn, back); + dri3_fence_await(draw->conn, draw, back); } void @@ -539,20 +684,18 @@ loader_dri3_copy_drawable(struct loader_dri3_drawable *draw, dri3_drawable_gc(draw), 0, 0, 0, 0, draw->width, draw->height); dri3_fence_trigger(draw->conn, dri3_fake_front_buffer(draw)); - dri3_fence_await(draw->conn, dri3_fake_front_buffer(draw)); + dri3_fence_await(draw->conn, draw, dri3_fake_front_buffer(draw)); } void loader_dri3_wait_x(struct loader_dri3_drawable *draw) { struct loader_dri3_buffer *front; - __DRIcontext *dri_context; if (draw == NULL || !draw->have_fake_front) return; front = dri3_fake_front_buffer(draw); - dri_context = draw->vtable->get_dri_context(draw); loader_dri3_copy_drawable(draw, front->pixmap, draw->drawable); @@ -561,39 +704,34 @@ loader_dri3_wait_x(struct loader_dri3_drawable *draw) * Copy back to the tiled buffer we use for rendering. * Note that we don't need flushing. */ - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) - draw->ext->image->blitImage(dri_context, - front->image, - front->linear_buffer, - 0, 0, front->width, - front->height, - 0, 0, front->width, - front->height, 0); + if (draw->is_different_gpu) + (void) loader_dri3_blit_image(draw, + front->image, + front->linear_buffer, + 0, 0, front->width, front->height, + 0, 0, 0); } void loader_dri3_wait_gl(struct loader_dri3_drawable *draw) { struct loader_dri3_buffer *front; - __DRIcontext *dri_context; if (draw == NULL || !draw->have_fake_front) return; front = dri3_fake_front_buffer(draw); - dri_context = draw->vtable->get_dri_context(draw); /* In the psc->is_different_gpu case, we update the linear_buffer * before updating the real front. */ - if (draw->is_different_gpu && draw->vtable->in_current_context(draw)) - draw->ext->image->blitImage(dri_context, - front->linear_buffer, - front->image, - 0, 0, front->width, - front->height, - 0, 0, front->width, - front->height, __BLIT_FLAG_FLUSH); + if (draw->is_different_gpu) + (void) loader_dri3_blit_image(draw, + front->linear_buffer, + front->image, + 0, 0, front->width, front->height, + 0, 0, __BLIT_FLAG_FLUSH); + loader_dri3_swapbuffer_barrier(draw); loader_dri3_copy_drawable(draw, draw->drawable, front->pixmap); } @@ -629,34 +767,41 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, bool force_copy) { struct loader_dri3_buffer *back; - __DRIcontext *dri_context; int64_t ret = 0; uint32_t options = XCB_PRESENT_OPTION_NONE; - int swap_interval; - - dri_context = draw->vtable->get_dri_context(draw); - swap_interval = draw->vtable->get_swap_interval(draw); draw->vtable->flush_drawable(draw, flush_flags); - back = draw->buffers[LOADER_DRI3_BACK_ID(draw->cur_back)]; + back = dri3_find_back_alloc(draw); + if (draw->is_different_gpu && back) { /* Update the linear buffer before presenting the pixmap */ - draw->ext->image->blitImage(dri_context, - back->linear_buffer, - back->image, - 0, 0, back->width, - back->height, - 0, 0, back->width, - back->height, __BLIT_FLAG_FLUSH); - /* Update the fake front */ - if (draw->have_fake_front) - draw->ext->image->blitImage(dri_context, - draw->buffers[LOADER_DRI3_FRONT_ID]->image, - back->image, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, - __BLIT_FLAG_FLUSH); + (void) loader_dri3_blit_image(draw, + back->linear_buffer, + back->image, + 0, 0, back->width, back->height, + 0, 0, __BLIT_FLAG_FLUSH); + } + + /* If we need to preload the new back buffer, remember the source. + * The force_copy parameter is used by EGL to attempt to preserve + * the back buffer across a call to this function. + */ + if (draw->swap_method != __DRI_ATTRIB_SWAP_UNDEFINED || force_copy) + draw->cur_blit_source = LOADER_DRI3_BACK_ID(draw->cur_back); + + /* Exchange the back and fake front. Even though the server knows about these + * buffers, it has no notion of back and fake front. + */ + if (back && draw->have_fake_front) { + struct loader_dri3_buffer *tmp; + + tmp = dri3_fake_front_buffer(draw); + draw->buffers[LOADER_DRI3_FRONT_ID] = back; + draw->buffers[LOADER_DRI3_BACK_ID(draw->cur_back)] = tmp; + + if (draw->swap_method == __DRI_ATTRIB_SWAP_COPY || force_copy) + draw->cur_blit_source = LOADER_DRI3_FRONT_ID; } dri3_flush_present_events(draw); @@ -671,7 +816,7 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, */ ++draw->send_sbc; if (target_msc == 0 && divisor == 0 && remainder == 0) - target_msc = draw->msc + swap_interval * + target_msc = draw->msc + draw->swap_interval * (draw->send_sbc - draw->recv_sbc); else if (divisor == 0 && remainder > 0) { /* From the GLX_OML_sync_control spec: @@ -695,10 +840,15 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, * behaviour by not using XCB_PRESENT_OPTION_ASYNC, but this should not be * the default. */ - if (swap_interval == 0) + if (draw->swap_interval == 0) options |= XCB_PRESENT_OPTION_ASYNC; - if (force_copy) - options |= XCB_PRESENT_OPTION_COPY; + + /* If we need to populate the new back, but need to reuse the back + * buffer slot due to lack of local blit capabilities, make sure + * the server doesn't flip and we deadlock. + */ + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1) + options |= XCB_PRESENT_OPTION_COPY; back->busy = 1; back->last_swap = draw->send_sbc; @@ -719,27 +869,32 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, remainder, 0, NULL); ret = (int64_t) draw->send_sbc; - /* If there's a fake front, then copy the source back buffer - * to the fake front to keep it up to date. This needs - * to reset the fence and make future users block until - * the X server is done copying the bits + /* Schedule a server-side back-preserving blit if necessary. + * This happens iff all conditions below are satisfied: + * a) We have a fake front, + * b) We need to preserve the back buffer, + * c) We don't have local blit capabilities. */ - if (draw->have_fake_front && !draw->is_different_gpu) { - dri3_fence_reset(draw->conn, draw->buffers[LOADER_DRI3_FRONT_ID]); - dri3_copy_area(draw->conn, - back->pixmap, - draw->buffers[LOADER_DRI3_FRONT_ID]->pixmap, + if (!loader_dri3_have_image_blit(draw) && draw->cur_blit_source != -1 && + draw->cur_blit_source != LOADER_DRI3_BACK_ID(draw->cur_back)) { + struct loader_dri3_buffer *new_back = dri3_back_buffer(draw); + struct loader_dri3_buffer *src = draw->buffers[draw->cur_blit_source]; + + dri3_fence_reset(draw->conn, new_back); + dri3_copy_area(draw->conn, src->pixmap, + new_back->pixmap, dri3_drawable_gc(draw), - 0, 0, 0, 0, - draw->width, draw->height); - dri3_fence_trigger(draw->conn, draw->buffers[LOADER_DRI3_FRONT_ID]); + 0, 0, 0, 0, draw->width, draw->height); + dri3_fence_trigger(draw->conn, new_back); + new_back->last_swap = src->last_swap; } + xcb_flush(draw->conn); if (draw->stamp) ++(*draw->stamp); } - (draw->ext->flush->invalidate)(draw->dri_drawable); + draw->ext->flush->invalidate(draw->dri_drawable); return ret; } @@ -747,15 +902,12 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw, int loader_dri3_query_buffer_age(struct loader_dri3_drawable *draw) { - int back_id = LOADER_DRI3_BACK_ID(dri3_find_back(draw)); + struct loader_dri3_buffer *back = dri3_find_back_alloc(draw); - if (back_id < 0 || !draw->buffers[back_id]) + if (!back || back->last_swap == 0) return 0; - if (draw->buffers[back_id]->last_swap != 0) - return draw->send_sbc - draw->buffers[back_id]->last_swap + 1; - else - return 0; + return draw->send_sbc - back->last_swap + 1; } /** loader_dri3_open @@ -785,6 +937,7 @@ loader_dri3_open(xcb_connection_t *conn, } fd = xcb_dri3_open_reply_fds(conn, reply)[0]; + free(reply); fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); return fd; @@ -812,6 +965,27 @@ dri3_cpp_for_format(uint32_t format) { } } +/* the DRIimage createImage function takes __DRI_IMAGE_FORMAT codes, while + * the createImageFromFds call takes __DRI_IMAGE_FOURCC codes. To avoid + * complete confusion, just deal in __DRI_IMAGE_FORMAT codes for now and + * translate to __DRI_IMAGE_FOURCC codes in the call to createImageFromFds + */ +static int +image_format_to_fourcc(int format) +{ + + /* Convert from __DRI_IMAGE_FORMAT to __DRI_IMAGE_FOURCC (sigh) */ + switch (format) { + case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888; + case __DRI_IMAGE_FORMAT_RGB565: return __DRI_IMAGE_FOURCC_RGB565; + case __DRI_IMAGE_FORMAT_XRGB8888: return __DRI_IMAGE_FOURCC_XRGB8888; + case __DRI_IMAGE_FORMAT_ARGB8888: return __DRI_IMAGE_FOURCC_ARGB8888; + case __DRI_IMAGE_FORMAT_ABGR8888: return __DRI_IMAGE_FOURCC_ABGR8888; + case __DRI_IMAGE_FORMAT_XBGR8888: return __DRI_IMAGE_FOURCC_XBGR8888; + } + return 0; +} + /** loader_dri3_alloc_render_buffer * * Use the driver createImage function to construct a __DRIimage, then @@ -854,32 +1028,34 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, goto no_image; if (!draw->is_different_gpu) { - buffer->image = (draw->ext->image->createImage)(draw->dri_screen, - width, height, - format, - __DRI_IMAGE_USE_SHARE | - __DRI_IMAGE_USE_SCANOUT, - buffer); + buffer->image = draw->ext->image->createImage(draw->dri_screen, + width, height, + format, + __DRI_IMAGE_USE_SHARE | + __DRI_IMAGE_USE_SCANOUT | + __DRI_IMAGE_USE_BACKBUFFER, + buffer); pixmap_buffer = buffer->image; if (!buffer->image) goto no_image; } else { - buffer->image = (draw->ext->image->createImage)(draw->dri_screen, - width, height, - format, - 0, - buffer); + buffer->image = draw->ext->image->createImage(draw->dri_screen, + width, height, + format, + 0, + buffer); if (!buffer->image) goto no_image; buffer->linear_buffer = - (draw->ext->image->createImage)(draw->dri_screen, - width, height, format, - __DRI_IMAGE_USE_SHARE | - __DRI_IMAGE_USE_LINEAR, - buffer); + draw->ext->image->createImage(draw->dri_screen, + width, height, format, + __DRI_IMAGE_USE_SHARE | + __DRI_IMAGE_USE_LINEAR | + __DRI_IMAGE_USE_BACKBUFFER, + buffer); pixmap_buffer = buffer->linear_buffer; if (!buffer->linear_buffer) @@ -888,14 +1064,14 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, /* X wants the stride, so ask the image for it */ - if (!(draw->ext->image->queryImage)(pixmap_buffer, __DRI_IMAGE_ATTRIB_STRIDE, - &stride)) + if (!draw->ext->image->queryImage(pixmap_buffer, __DRI_IMAGE_ATTRIB_STRIDE, + &stride)) goto no_buffer_attrib; buffer->pitch = stride; - if (!(draw->ext->image->queryImage)(pixmap_buffer, __DRI_IMAGE_ATTRIB_FD, - &buffer_fd)) + if (!draw->ext->image->queryImage(pixmap_buffer, __DRI_IMAGE_ATTRIB_FD, + &buffer_fd)) goto no_buffer_attrib; xcb_dri3_pixmap_from_buffer(draw->conn, @@ -926,10 +1102,10 @@ dri3_alloc_render_buffer(struct loader_dri3_drawable *draw, unsigned int format, return buffer; no_buffer_attrib: - (draw->ext->image->destroyImage)(pixmap_buffer); + draw->ext->image->destroyImage(pixmap_buffer); no_linear_buffer: if (draw->is_different_gpu) - (draw->ext->image->destroyImage)(buffer->image); + draw->ext->image->destroyImage(buffer->image); no_image: free(buffer); no_buffer: @@ -1033,27 +1209,6 @@ dri3_update_drawable(__DRIdrawable *driDrawable, return true; } -/* the DRIimage createImage function takes __DRI_IMAGE_FORMAT codes, while - * the createImageFromFds call takes __DRI_IMAGE_FOURCC codes. To avoid - * complete confusion, just deal in __DRI_IMAGE_FORMAT codes for now and - * translate to __DRI_IMAGE_FOURCC codes in the call to createImageFromFds - */ -static int -image_format_to_fourcc(int format) -{ - - /* Convert from __DRI_IMAGE_FORMAT to __DRI_IMAGE_FOURCC (sigh) */ - switch (format) { - case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888; - case __DRI_IMAGE_FORMAT_RGB565: return __DRI_IMAGE_FOURCC_RGB565; - case __DRI_IMAGE_FORMAT_XRGB8888: return __DRI_IMAGE_FOURCC_XRGB8888; - case __DRI_IMAGE_FORMAT_ARGB8888: return __DRI_IMAGE_FOURCC_ARGB8888; - case __DRI_IMAGE_FORMAT_ABGR8888: return __DRI_IMAGE_FOURCC_ABGR8888; - case __DRI_IMAGE_FORMAT_XBGR8888: return __DRI_IMAGE_FOURCC_XBGR8888; - } - return 0; -} - __DRIimage * loader_dri3_create_image(xcb_connection_t *c, xcb_dri3_buffer_from_pixmap_reply_t *bp_reply, @@ -1078,19 +1233,19 @@ loader_dri3_create_image(xcb_connection_t *c, * we've gotten the planar wrapper, pull the single plane out of it and * discard the wrapper. */ - image_planar = (image->createImageFromFds)(dri_screen, - bp_reply->width, - bp_reply->height, - image_format_to_fourcc(format), - fds, 1, - &stride, &offset, loaderPrivate); + image_planar = image->createImageFromFds(dri_screen, + bp_reply->width, + bp_reply->height, + image_format_to_fourcc(format), + fds, 1, + &stride, &offset, loaderPrivate); close(fds[0]); if (!image_planar) return NULL; - ret = (image->fromPlanar)(image_planar, 0, loaderPrivate); + ret = image->fromPlanar(image_planar, 0, loaderPrivate); - (image->destroyImage)(image_planar); + image->destroyImage(image_planar); return ret; } @@ -1153,7 +1308,6 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int format, buffer->own_pixmap = false; buffer->width = bp_reply->width; buffer->height = bp_reply->height; - buffer->buffer_type = buffer_type; buffer->shm_fence = shm_fence; buffer->sync_fence = sync_fence; @@ -1185,11 +1339,10 @@ dri3_get_buffer(__DRIdrawable *driDrawable, { struct loader_dri3_buffer *buffer; int buf_id; - __DRIcontext *dri_context; - - dri_context = draw->vtable->get_dri_context(draw); if (buffer_type == loader_dri3_buffer_back) { + draw->back_format = format; + buf_id = dri3_find_back(draw); if (buf_id < 0) @@ -1220,30 +1373,31 @@ dri3_get_buffer(__DRIdrawable *driDrawable, /* When resizing, copy the contents of the old buffer, waiting for that * copy to complete using our fences before proceeding */ - switch (buffer_type) { - case loader_dri3_buffer_back: - if (buffer) { - if (!buffer->linear_buffer) { - dri3_fence_reset(draw->conn, new_buffer); - dri3_fence_await(draw->conn, buffer); - dri3_copy_area(draw->conn, - buffer->pixmap, - new_buffer->pixmap, - dri3_drawable_gc(draw), - 0, 0, 0, 0, - draw->width, draw->height); - dri3_fence_trigger(draw->conn, new_buffer); - } else if (draw->vtable->in_current_context(draw)) { - draw->ext->image->blitImage(dri_context, - new_buffer->image, - buffer->image, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, 0); - } - dri3_free_render_buffer(draw, buffer); + if ((buffer_type == loader_dri3_buffer_back || + (buffer_type == loader_dri3_buffer_front && draw->have_fake_front)) + && buffer) { + + /* Fill the new buffer with data from an old buffer */ + dri3_fence_await(draw->conn, draw, buffer); + if (!loader_dri3_blit_image(draw, + new_buffer->image, + buffer->image, + 0, 0, draw->width, draw->height, + 0, 0, 0) && + !buffer->linear_buffer) { + dri3_fence_reset(draw->conn, new_buffer); + dri3_copy_area(draw->conn, + buffer->pixmap, + new_buffer->pixmap, + dri3_drawable_gc(draw), + 0, 0, 0, 0, + draw->width, draw->height); + dri3_fence_trigger(draw->conn, new_buffer); } - break; - case loader_dri3_buffer_front: + dri3_free_render_buffer(draw, buffer); + } else if (buffer_type == loader_dri3_buffer_front) { + /* Fill the new fake front with data from a real front */ + loader_dri3_swapbuffer_barrier(draw); dri3_fence_reset(draw->conn, new_buffer); dri3_copy_area(draw->conn, draw->drawable, @@ -1253,23 +1407,45 @@ dri3_get_buffer(__DRIdrawable *driDrawable, draw->width, draw->height); dri3_fence_trigger(draw->conn, new_buffer); - if (new_buffer->linear_buffer && - draw->vtable->in_current_context(draw)) { - dri3_fence_await(draw->conn, new_buffer); - draw->ext->image->blitImage(dri_context, - new_buffer->image, - new_buffer->linear_buffer, - 0, 0, draw->width, draw->height, - 0, 0, draw->width, draw->height, 0); + if (new_buffer->linear_buffer) { + dri3_fence_await(draw->conn, draw, new_buffer); + (void) loader_dri3_blit_image(draw, + new_buffer->image, + new_buffer->linear_buffer, + 0, 0, draw->width, draw->height, + 0, 0, 0); } - break; } buffer = new_buffer; - buffer->buffer_type = buffer_type; draw->buffers[buf_id] = buffer; } - dri3_fence_await(draw->conn, buffer); + dri3_fence_await(draw->conn, draw, buffer); + /* + * Do we need to preserve the content of a previous buffer? + * + * Note that this blit is needed only to avoid a wait for a buffer that + * is currently in the flip chain or being scanned out from. That's really + * a tradeoff. If we're ok with the wait we can reduce the number of back + * buffers to 1 for SWAP_EXCHANGE, and 1 for SWAP_COPY, + * but in the latter case we must disallow page-flipping. + */ + if (buffer_type == loader_dri3_buffer_back && + draw->cur_blit_source != -1 && + draw->buffers[draw->cur_blit_source] && + buffer != draw->buffers[draw->cur_blit_source]) { + + struct loader_dri3_buffer *source = draw->buffers[draw->cur_blit_source]; + + /* Avoid flushing here. Will propably do good for tiling hardware. */ + (void) loader_dri3_blit_image(draw, + buffer->image, + source->image, + 0, 0, draw->width, draw->height, + 0, 0, 0); + buffer->last_swap = source->last_swap; + draw->cur_blit_source = -1; + } /* Return the requested buffer */ return buffer; } @@ -1293,10 +1469,12 @@ dri3_free_buffers(__DRIdrawable *driDrawable, case loader_dri3_buffer_back: first_id = LOADER_DRI3_BACK_ID(0); n_id = LOADER_DRI3_MAX_BACK; + draw->cur_blit_source = -1; break; case loader_dri3_buffer_front: first_id = LOADER_DRI3_FRONT_ID; - n_id = 1; + /* Don't free a fake front holding new backbuffer content. */ + n_id = (draw->cur_blit_source == LOADER_DRI3_FRONT_ID) ? 0 : 1; } for (buf_id = first_id; buf_id < first_id + n_id; buf_id++) { @@ -1335,8 +1513,10 @@ loader_dri3_get_buffers(__DRIdrawable *driDrawable, if (!dri3_update_drawable(driDrawable, draw)) return false; - /* pixmaps always have front buffers */ - if (draw->is_pixmap) + /* pixmaps always have front buffers. + * Exchange swaps also mandate fake front buffers. + */ + if (draw->is_pixmap || draw->swap_method == __DRI_ATTRIB_SWAP_EXCHANGE) buffer_mask |= __DRI_IMAGE_BUFFER_FRONT; if (buffer_mask & __DRI_IMAGE_BUFFER_FRONT) { @@ -1394,3 +1574,112 @@ loader_dri3_get_buffers(__DRIdrawable *driDrawable, return true; } + +/** loader_dri3_update_drawable_geometry + * + * Get the current drawable geometry. + */ +void +loader_dri3_update_drawable_geometry(struct loader_dri3_drawable *draw) +{ + xcb_get_geometry_cookie_t geom_cookie; + xcb_get_geometry_reply_t *geom_reply; + + geom_cookie = xcb_get_geometry(draw->conn, draw->drawable); + + geom_reply = xcb_get_geometry_reply(draw->conn, geom_cookie, NULL); + + if (geom_reply) { + draw->width = geom_reply->width; + draw->height = geom_reply->height; + draw->vtable->set_drawable_size(draw, draw->width, draw->height); + draw->ext->flush->invalidate(draw->dri_drawable); + + free(geom_reply); + } +} + + +/** + * Make sure the server has flushed all pending swap buffers to hardware + * for this drawable. Ideally we'd want to send an X protocol request to + * have the server block our connection until the swaps are complete. That + * would avoid the potential round-trip here. + */ +void +loader_dri3_swapbuffer_barrier(struct loader_dri3_drawable *draw) +{ + int64_t ust, msc, sbc; + + (void) loader_dri3_wait_for_sbc(draw, 0, &ust, &msc, &sbc); +} + +/** + * Perform any cleanup associated with a close screen operation. + * \param dri_screen[in,out] Pointer to __DRIscreen about to be closed. + * + * This function destroys the screen's cached swap context if any. + */ +void +loader_dri3_close_screen(__DRIscreen *dri_screen) +{ + mtx_lock(&blit_context.mtx); + if (blit_context.ctx && blit_context.cur_screen == dri_screen) { + blit_context.core->destroyContext(blit_context.ctx); + blit_context.ctx = NULL; + } + mtx_unlock(&blit_context.mtx); +} + +/** + * Find a backbuffer slot - potentially allocating a back buffer + * + * \param draw[in,out] Pointer to the drawable for which to find back. + * \return Pointer to a new back buffer or NULL if allocation failed or was + * not mandated. + * + * Find a potentially new back buffer, and if it's not been allocated yet and + * in addition needs initializing, then try to allocate and initialize it. + */ +#include +static struct loader_dri3_buffer * +dri3_find_back_alloc(struct loader_dri3_drawable *draw) +{ + struct loader_dri3_buffer *back; + int id; + + id = dri3_find_back(draw); + if (id < 0) + return NULL; + + back = draw->buffers[id]; + /* Allocate a new back if we haven't got one */ + if (!back && draw->back_format != __DRI_IMAGE_FORMAT_NONE && + dri3_update_drawable(draw->dri_drawable, draw)) + back = dri3_alloc_render_buffer(draw, draw->back_format, + draw->width, draw->height, draw->depth); + + if (!back) + return NULL; + + draw->buffers[id] = back; + + /* If necessary, prefill the back with data according to swap_method mode. */ + if (draw->cur_blit_source != -1 && + draw->buffers[draw->cur_blit_source] && + back != draw->buffers[draw->cur_blit_source]) { + struct loader_dri3_buffer *source = draw->buffers[draw->cur_blit_source]; + + dri3_fence_await(draw->conn, draw, source); + dri3_fence_await(draw->conn, draw, back); + (void) loader_dri3_blit_image(draw, + back->image, + source->image, + 0, 0, draw->width, draw->height, + 0, 0, 0); + back->last_swap = source->last_swap; + draw->cur_blit_source = -1; + } + + return back; +}