iris: Destroy the border color pool

This plugs a 12224 byte leak

diff --git a/src/gallium/drivers/iris/iris_border_color.c b/src/gallium/drivers/iris/iris_border_color.c
index 72c7ee4904c7a695c0b03d78489de9e1be05eaea..ebed3e4445d449d51d1132772734e977dd6873a3 100644 (file)
--- a/src/gallium/drivers/iris/iris_border_color.c
+++ b/src/gallium/drivers/iris/iris_border_color.c
@@ -93,6 +93,14 @@ iris_init_border_color_pool(struct iris_context *ice)
    iris_reset_border_color_pool(pool, bufmgr);
 }
 
+void
+iris_destroy_border_color_pool(struct iris_context *ice)
+{
+   struct iris_border_color_pool *pool = &ice->state.border_color_pool;
+   iris_bo_unreference(pool->bo);
+   ralloc_free(pool->ht);
+}
+
 /**
  * Reserve space for a number of border colors.  If no space, flushes any
  * batches that are referring to the old BO and makes a new one.

diff --git a/src/gallium/drivers/iris/iris_context.c b/src/gallium/drivers/iris/iris_context.c
index 75b1be273066904e237147e3c267c13640a03f0a..0bf100ae4db2175db6b9719ffaadd2ff4d8a782f 100644 (file)
--- a/src/gallium/drivers/iris/iris_context.c
+++ b/src/gallium/drivers/iris/iris_context.c
@@ -110,6 +110,7 @@ iris_destroy_context(struct pipe_context *ctx)
 
    ice->vtbl.destroy_state(ice);
    iris_destroy_program_cache(ice);
+   iris_destroy_border_color_pool(ice);
    u_upload_destroy(ice->state.surface_uploader);
    u_upload_destroy(ice->state.dynamic_uploader);
 

diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index 601dabb4ceffbe7bd2d744738a843753cb20b036..5c5fbaf7eabc1351e0667f088f6b57a67ee7805a 100644 (file)
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -587,6 +587,7 @@ void gen11_init_blorp(struct iris_context *ice);
 /* iris_border_color.c */
 
 void iris_init_border_color_pool(struct iris_context *ice);
+void iris_destroy_border_color_pool(struct iris_context *ice);
 void iris_border_color_pool_reserve(struct iris_context *ice, unsigned count);
 uint32_t iris_upload_border_color(struct iris_context *ice,
                                   union pipe_color_union *color);