[v7,4/5] st/dri2: Implement DRI2bufferDamageExtension

Submitted by Boris Brezillon on Aug. 12, 2019, 10:07 a.m.

Details

Message ID 20190812100708.10263-5-boris.brezillon@collabora.com
State New
Headers show
Series "EGL_KHR_partial_update support" ( rev: 4 ) in Mesa

Not browsing as part of any series.

Commit Message

Boris Brezillon Aug. 12, 2019, 10:07 a.m.
From: Daniel Stone <daniels@collabora.com>

Add a pipe_screen->set_damage_region() hook to propagate
set-damage-region requests to the driver, it's then up to the driver to
decide what to do with this piece of information.

If the hook is left unassigned, the buffer-damage extension is
considered unsupported.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---
Changes in v7:
* Add a missing FREE() in dri2_set_damage_region() (Reported by Qiang)

Changes in v6:
* Pass pipe_box objects instead ints
* Document the set_damage_region() hook

Changes in v5:
* Add Alyssa's R-b
---
 src/gallium/include/pipe/p_screen.h   | 17 +++++++++++++
 src/gallium/state_trackers/dri/dri2.c | 35 +++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

Patch hide | download patch | download mbox

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 9bd247722993..cf8e30634838 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -464,6 +464,23 @@  struct pipe_screen {
    bool (*is_parallel_shader_compilation_finished)(struct pipe_screen *screen,
                                                    void *shader,
                                                    unsigned shader_type);
+
+   /**
+    * Set the damage region (called when KHR_partial_update() is invoked).
+    * This function is passed an array of rectangles encoding the damage area.
+    * rects are using the bottom-left origin convention.
+    * nrects = 0 means 'reset the damage region'. What 'reset' implies is HW
+    * specific. For tile-based renderers, the damage extent is typically set
+    * to cover the whole resource with no damage rect (or a 0-size damage
+    * rect). This way, the existing resource content is reloaded into the
+    * local tile buffer for every tile thus making partial tile update
+    * possible. For HW operating in immediate mode, this reset operation is
+    * likely to be a NOOP.
+    */
+   void (*set_damage_region)(struct pipe_screen *screen,
+                             struct pipe_resource *resource,
+                             unsigned int nrects,
+                             const struct pipe_box *rects);
 };
 
 
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 1ead99ed01b1..22cf4caca8d0 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -1680,6 +1680,36 @@  static const __DRI2interopExtension dri2InteropExtension = {
    .export_object = dri2_interop_export_object
 };
 
+/**
+ * \brief the DRI2bufferDamageExtension set_damage_region method
+ */
+static void
+dri2_set_damage_region(__DRIdrawable *dPriv, unsigned int nrects, int *rects)
+{
+   struct dri_drawable *drawable = dri_drawable(dPriv);
+   struct pipe_resource *resource = drawable->textures[ST_ATTACHMENT_BACK_LEFT];
+   struct pipe_screen *screen = resource->screen;
+   struct pipe_box *boxes = NULL;
+
+   if (nrects) {
+      boxes = CALLOC(nrects, sizeof(*boxes));
+      assert(boxes);
+
+      for (unsigned int i = 0; i < nrects; i++) {
+         int *rect = &rects[i * 4];
+
+         u_box_2d(rect[0], rect[1], rect[2], rect[3], &boxes[i]);
+      }
+   }
+
+   screen->set_damage_region(screen, resource, nrects, boxes);
+   FREE(boxes);
+}
+
+static __DRI2bufferDamageExtension dri2BufferDamageExtension = {
+   .base = { __DRI2_BUFFER_DAMAGE, 1 },
+};
+
 /**
  * \brief the DRI2ConfigQueryExtension configQueryb method
  */
@@ -1781,6 +1811,7 @@  static const __DRIextension *dri_screen_extensions[] = {
    &dri2GalliumConfigQueryExtension.base,
    &dri2ThrottleExtension.base,
    &dri2FenceExtension.base,
+   &dri2BufferDamageExtension.base,
    &dri2InteropExtension.base,
    &dri2NoErrorExtension.base,
    &driBlobExtension.base,
@@ -1796,6 +1827,7 @@  static const __DRIextension *dri_robust_screen_extensions[] = {
    &dri2ThrottleExtension.base,
    &dri2FenceExtension.base,
    &dri2InteropExtension.base,
+   &dri2BufferDamageExtension.base,
    &dri2Robustness.base,
    &dri2NoErrorExtension.base,
    &driBlobExtension.base,
@@ -1856,6 +1888,9 @@  dri2_init_screen(__DRIscreen * sPriv)
       }
    }
 
+   if (pscreen->set_damage_region)
+      dri2BufferDamageExtension.set_damage_region = dri2_set_damage_region;
+
    if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
       sPriv->extensions = dri_robust_screen_extensions;
       screen->has_reset_status_query = true;

Comments

Looks good for me, patch is:
Reviewed-by: Qiang Yu <yuq825@gmail.com>

Regards,
Qiang

On Mon, Aug 12, 2019 at 6:07 PM Boris Brezillon
<boris.brezillon@collabora.com> wrote:
>
> From: Daniel Stone <daniels@collabora.com>
>
> Add a pipe_screen->set_damage_region() hook to propagate
> set-damage-region requests to the driver, it's then up to the driver to
> decide what to do with this piece of information.
>
> If the hook is left unassigned, the buffer-damage extension is
> considered unsupported.
>
> Signed-off-by: Daniel Stone <daniels@collabora.com>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
> ---
> Changes in v7:
> * Add a missing FREE() in dri2_set_damage_region() (Reported by Qiang)
>
> Changes in v6:
> * Pass pipe_box objects instead ints
> * Document the set_damage_region() hook
>
> Changes in v5:
> * Add Alyssa's R-b
> ---
>  src/gallium/include/pipe/p_screen.h   | 17 +++++++++++++
>  src/gallium/state_trackers/dri/dri2.c | 35 +++++++++++++++++++++++++++
>  2 files changed, 52 insertions(+)
>
> diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
> index 9bd247722993..cf8e30634838 100644
> --- a/src/gallium/include/pipe/p_screen.h
> +++ b/src/gallium/include/pipe/p_screen.h
> @@ -464,6 +464,23 @@ struct pipe_screen {
>     bool (*is_parallel_shader_compilation_finished)(struct pipe_screen *screen,
>                                                     void *shader,
>                                                     unsigned shader_type);
> +
> +   /**
> +    * Set the damage region (called when KHR_partial_update() is invoked).
> +    * This function is passed an array of rectangles encoding the damage area.
> +    * rects are using the bottom-left origin convention.
> +    * nrects = 0 means 'reset the damage region'. What 'reset' implies is HW
> +    * specific. For tile-based renderers, the damage extent is typically set
> +    * to cover the whole resource with no damage rect (or a 0-size damage
> +    * rect). This way, the existing resource content is reloaded into the
> +    * local tile buffer for every tile thus making partial tile update
> +    * possible. For HW operating in immediate mode, this reset operation is
> +    * likely to be a NOOP.
> +    */
> +   void (*set_damage_region)(struct pipe_screen *screen,
> +                             struct pipe_resource *resource,
> +                             unsigned int nrects,
> +                             const struct pipe_box *rects);
>  };
>
>
> diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
> index 1ead99ed01b1..22cf4caca8d0 100644
> --- a/src/gallium/state_trackers/dri/dri2.c
> +++ b/src/gallium/state_trackers/dri/dri2.c
> @@ -1680,6 +1680,36 @@ static const __DRI2interopExtension dri2InteropExtension = {
>     .export_object = dri2_interop_export_object
>  };
>
> +/**
> + * \brief the DRI2bufferDamageExtension set_damage_region method
> + */
> +static void
> +dri2_set_damage_region(__DRIdrawable *dPriv, unsigned int nrects, int *rects)
> +{
> +   struct dri_drawable *drawable = dri_drawable(dPriv);
> +   struct pipe_resource *resource = drawable->textures[ST_ATTACHMENT_BACK_LEFT];
> +   struct pipe_screen *screen = resource->screen;
> +   struct pipe_box *boxes = NULL;
> +
> +   if (nrects) {
> +      boxes = CALLOC(nrects, sizeof(*boxes));
> +      assert(boxes);
> +
> +      for (unsigned int i = 0; i < nrects; i++) {
> +         int *rect = &rects[i * 4];
> +
> +         u_box_2d(rect[0], rect[1], rect[2], rect[3], &boxes[i]);
> +      }
> +   }
> +
> +   screen->set_damage_region(screen, resource, nrects, boxes);
> +   FREE(boxes);
> +}
> +
> +static __DRI2bufferDamageExtension dri2BufferDamageExtension = {
> +   .base = { __DRI2_BUFFER_DAMAGE, 1 },
> +};
> +
>  /**
>   * \brief the DRI2ConfigQueryExtension configQueryb method
>   */
> @@ -1781,6 +1811,7 @@ static const __DRIextension *dri_screen_extensions[] = {
>     &dri2GalliumConfigQueryExtension.base,
>     &dri2ThrottleExtension.base,
>     &dri2FenceExtension.base,
> +   &dri2BufferDamageExtension.base,
>     &dri2InteropExtension.base,
>     &dri2NoErrorExtension.base,
>     &driBlobExtension.base,
> @@ -1796,6 +1827,7 @@ static const __DRIextension *dri_robust_screen_extensions[] = {
>     &dri2ThrottleExtension.base,
>     &dri2FenceExtension.base,
>     &dri2InteropExtension.base,
> +   &dri2BufferDamageExtension.base,
>     &dri2Robustness.base,
>     &dri2NoErrorExtension.base,
>     &driBlobExtension.base,
> @@ -1856,6 +1888,9 @@ dri2_init_screen(__DRIscreen * sPriv)
>        }
>     }
>
> +   if (pscreen->set_damage_region)
> +      dri2BufferDamageExtension.set_damage_region = dri2_set_damage_region;
> +
>     if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
>        sPriv->extensions = dri_robust_screen_extensions;
>        screen->has_reset_status_query = true;
> --
> 2.21.0
>