Re: [Mesa-dev] [PATCH v4 7/7] gallium: add pipe_screen::resource_changed callback wrappers

[Emil Velikov]

On 6 December 2016 at 16:17, Philipp Zabel  wrote:
> Add resource_changed to the ddebug, rbug, and trace wrappers. Since it
> is optional, there is no need to add it to noop.
>
> Signed-off-by: Philipp Zabel 
> Suggested-by: Nicolai Hähnle 
> ---
>  src/gallium/drivers/ddebug/dd_screen.c | 10 ++
>  src/gallium/drivers/rbug/rbug_screen.c | 11 +++
>  src/gallium/drivers/trace/tr_screen.c  | 20 
>  3 files changed, 41 insertions(+)
>
> diff --git a/src/gallium/drivers/ddebug/dd_screen.c 
> b/src/gallium/drivers/ddebug/dd_screen.c
> index a0c0dd0..3e20abe 100644
> --- a/src/gallium/drivers/ddebug/dd_screen.c
> +++ b/src/gallium/drivers/ddebug/dd_screen.c
> @@ -227,6 +227,15 @@ dd_screen_resource_from_user_memory(struct pipe_screen 
> *_screen,
>  }
>
>  static void
> +dd_screen_resource_changed(struct pipe_screen *_screen,
> +   struct pipe_resource *res)
> +{
> +   struct pipe_screen *screen = dd_screen(_screen)->screen;
> +
> +   screen->resource_changed(screen, res);
> +}
> +
> +static void
>  dd_screen_resource_destroy(struct pipe_screen *_screen,
> struct pipe_resource *res)
>  {
> @@ -385,6 +394,7 @@ ddebug_screen_create(struct pipe_screen *screen)
> dscreen->base.resource_from_handle = dd_screen_resource_from_handle;
> SCR_INIT(resource_from_user_memory);
> dscreen->base.resource_get_handle = dd_screen_resource_get_handle;
> +   dscreen->base.resource_changed = dd_screen_resource_changed;
As mentioned by Marek this should use SCR_INIT() or we'll crash in our
wrapper above.

The other wrapper drivers will need similar macro/fix. Although from a
quick look they also need an implementation of the other optional API.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH v4 7/7] gallium: add pipe_screen::resource_changed callback wrappers

[Marek Olšák]

On Tue, Dec 6, 2016 at 5:17 PM, Philipp Zabel  wrote:
> Add resource_changed to the ddebug, rbug, and trace wrappers. Since it
> is optional, there is no need to add it to noop.
>
> Signed-off-by: Philipp Zabel 
> Suggested-by: Nicolai Hähnle 
> ---
>  src/gallium/drivers/ddebug/dd_screen.c | 10 ++
>  src/gallium/drivers/rbug/rbug_screen.c | 11 +++
>  src/gallium/drivers/trace/tr_screen.c  | 20 
>  3 files changed, 41 insertions(+)
>
> diff --git a/src/gallium/drivers/ddebug/dd_screen.c 
> b/src/gallium/drivers/ddebug/dd_screen.c
> index a0c0dd0..3e20abe 100644
> --- a/src/gallium/drivers/ddebug/dd_screen.c
> +++ b/src/gallium/drivers/ddebug/dd_screen.c
> @@ -227,6 +227,15 @@ dd_screen_resource_from_user_memory(struct pipe_screen 
> *_screen,
>  }
>
>  static void
> +dd_screen_resource_changed(struct pipe_screen *_screen,
> +   struct pipe_resource *res)
> +{
> +   struct pipe_screen *screen = dd_screen(_screen)->screen;
> +
> +   screen->resource_changed(screen, res);
> +}
> +
> +static void
>  dd_screen_resource_destroy(struct pipe_screen *_screen,
> struct pipe_resource *res)
>  {
> @@ -385,6 +394,7 @@ ddebug_screen_create(struct pipe_screen *screen)
> dscreen->base.resource_from_handle = dd_screen_resource_from_handle;
> SCR_INIT(resource_from_user_memory);
> dscreen->base.resource_get_handle = dd_screen_resource_get_handle;
> +   dscreen->base.resource_changed = dd_screen_resource_changed;

This should use SCR_INIT, because it's optional.

Marek
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v4 7/7] gallium: add pipe_screen::resource_changed callback wrappers

[Philipp Zabel]

Add resource_changed to the ddebug, rbug, and trace wrappers. Since it
is optional, there is no need to add it to noop.

Signed-off-by: Philipp Zabel 
Suggested-by: Nicolai Hähnle 
---
 src/gallium/drivers/ddebug/dd_screen.c | 10 ++
 src/gallium/drivers/rbug/rbug_screen.c | 11 +++
 src/gallium/drivers/trace/tr_screen.c  | 20 
 3 files changed, 41 insertions(+)

diff --git a/src/gallium/drivers/ddebug/dd_screen.c 
b/src/gallium/drivers/ddebug/dd_screen.c
index a0c0dd0..3e20abe 100644
--- a/src/gallium/drivers/ddebug/dd_screen.c
+++ b/src/gallium/drivers/ddebug/dd_screen.c
@@ -227,6 +227,15 @@ dd_screen_resource_from_user_memory(struct pipe_screen 
*_screen,
 }
 
 static void
+dd_screen_resource_changed(struct pipe_screen *_screen,
+   struct pipe_resource *res)
+{
+   struct pipe_screen *screen = dd_screen(_screen)->screen;
+
+   screen->resource_changed(screen, res);
+}
+
+static void
 dd_screen_resource_destroy(struct pipe_screen *_screen,
struct pipe_resource *res)
 {
@@ -385,6 +394,7 @@ ddebug_screen_create(struct pipe_screen *screen)
dscreen->base.resource_from_handle = dd_screen_resource_from_handle;
SCR_INIT(resource_from_user_memory);
dscreen->base.resource_get_handle = dd_screen_resource_get_handle;
+   dscreen->base.resource_changed = dd_screen_resource_changed;
dscreen->base.resource_destroy = dd_screen_resource_destroy;
SCR_INIT(flush_frontbuffer);
SCR_INIT(fence_reference);
diff --git a/src/gallium/drivers/rbug/rbug_screen.c 
b/src/gallium/drivers/rbug/rbug_screen.c
index 3742c10..4889366 100644
--- a/src/gallium/drivers/rbug/rbug_screen.c
+++ b/src/gallium/drivers/rbug/rbug_screen.c
@@ -191,7 +191,17 @@ rbug_screen_resource_get_handle(struct pipe_screen 
*_screen,
   resource, handle, usage);
 }
 
+static void
+rbug_screen_resource_changed(struct pipe_screen *_screen,
+ struct pipe_resource *_resource)
+{
+   struct rbug_screen *rb_screen = rbug_screen(_screen);
+   struct rbug_resource *rb_resource = rbug_resource(_resource);
+   struct pipe_screen *screen = rb_screen->screen;
+   struct pipe_resource *resource = rb_resource->resource;
 
+   return screen->resource_changed(screen, resource);
+}
 
 static void
 rbug_screen_resource_destroy(struct pipe_screen *screen,
@@ -279,6 +289,7 @@ rbug_screen_create(struct pipe_screen *screen)
rb_screen->base.resource_create = rbug_screen_resource_create;
rb_screen->base.resource_from_handle = rbug_screen_resource_from_handle;
rb_screen->base.resource_get_handle = rbug_screen_resource_get_handle;
+   rb_screen->base.resource_changed = rbug_screen_resource_changed;
rb_screen->base.resource_destroy = rbug_screen_resource_destroy;
rb_screen->base.flush_frontbuffer = rbug_screen_flush_frontbuffer;
rb_screen->base.fence_reference = rbug_screen_fence_reference;
diff --git a/src/gallium/drivers/trace/tr_screen.c 
b/src/gallium/drivers/trace/tr_screen.c
index 493725c..062e131 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -350,7 +350,26 @@ trace_screen_resource_get_handle(struct pipe_screen 
*_screen,
   resource, handle, usage);
 }
 
+static void
+trace_screen_resource_changed(struct pipe_screen *_screen,
+  struct pipe_resource *_resource)
+{
+   struct trace_screen *tr_scr = trace_screen(_screen);
+   struct trace_resource *tr_res = trace_resource(_resource);
+   struct pipe_screen *screen = tr_scr->screen;
+   struct pipe_resource *resource = tr_res->resource;
+
+   assert(resource->screen == screen);
 
+   trace_dump_call_begin("pipe_screen", "resource_changed");
+
+   trace_dump_arg(ptr, screen);
+   trace_dump_arg(ptr, resource);
+
+   screen->resource_changed(screen, resource);
+
+   trace_dump_call_end();
+}
 
 static void
 trace_screen_resource_destroy(struct pipe_screen *_screen,
@@ -513,6 +532,7 @@ trace_screen_create(struct pipe_screen *screen)
tr_scr->base.resource_create = trace_screen_resource_create;
tr_scr->base.resource_from_handle = trace_screen_resource_from_handle;
tr_scr->base.resource_get_handle = trace_screen_resource_get_handle;
+   tr_scr->base.resource_changed = trace_screen_resource_changed;
tr_scr->base.resource_destroy = trace_screen_resource_destroy;
tr_scr->base.fence_reference = trace_screen_fence_reference;
tr_scr->base.fence_finish = trace_screen_fence_finish;
-- 
2.10.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev