OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: keep a reference to used render-passes

Browse Source 
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Erik Faye-Lund
2019-06-20 15:29:20 +02:00
parent 1927d11fc0
commit 5dfa6be36e
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gallium/drivers/zink/zink_program.c
View File

@@ -25,9 +25,11 @@
#include "zink_compiler.h" #include "zink_compiler.h"
#include "zink_context.h" #include "zink_context.h"
#include "zink_render_pass.h"
#include "zink_screen.h" #include "zink_screen.h"
#include "util/hash_table.h" #include "util/hash_table.h"
#include "util/set.h"
#include "util/u_debug.h" #include "util/u_debug.h"
#include "util/u_memory.h" #include "util/u_memory.h"
@@ -130,6 +132,11 @@ zink_create_gfx_program(struct zink_screen *screen,
if (!prog->layout) if (!prog->layout)
goto fail; goto fail;
prog->render_passes = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
if (!prog->render_passes)
goto fail;
return prog; return prog;
fail: fail:
@@ -148,6 +155,15 @@ zink_destroy_gfx_program(struct zink_screen *screen,
if (prog->dsl) if (prog->dsl)
vkDestroyDescriptorSetLayout(screen->dev, prog->dsl, NULL); vkDestroyDescriptorSetLayout(screen->dev, prog->dsl, NULL);
/* unref all used render-passes */
if (prog->render_passes) {
set_foreach(prog->render_passes, entry) {
struct zink_render_pass *pres = (struct zink_render_pass *)entry->key;
zink_render_pass_reference(screen, &pres, NULL);
}
_mesa_set_destroy(prog->render_passes, NULL);
}
FREE(prog); FREE(prog);
} }
@@ -183,6 +199,20 @@ primitive_topology(enum pipe_prim_type mode)
} }
} }
static void
reference_render_pass(struct zink_screen *screen,
struct zink_gfx_program *prog,
struct zink_render_pass *render_pass)
{
struct set_entry *entry = _mesa_set_search(prog->render_passes,
render_pass);
if (!entry) {
struct zink_render_pass *tmp = NULL;
entry = _mesa_set_add(prog->render_passes, render_pass);
zink_render_pass_reference(screen, &tmp, render_pass);
}
}
VkPipeline VkPipeline
zink_get_gfx_pipeline(struct zink_screen *screen, zink_get_gfx_pipeline(struct zink_screen *screen,
struct zink_gfx_program *prog, struct zink_gfx_program *prog,
@@ -210,6 +240,8 @@ zink_get_gfx_pipeline(struct zink_screen *screen,
entry = _mesa_hash_table_insert(prog->pipelines[mode], &pc_entry->state, pc_entry); entry = _mesa_hash_table_insert(prog->pipelines[mode], &pc_entry->state, pc_entry);
assert(entry); assert(entry);
reference_render_pass(screen, prog, state->render_pass);
} }
return ((struct pipeline_cache_entry *)(entry->data))->pipeline; return ((struct pipeline_cache_entry *)(entry->data))->pipeline;

4
src/gallium/drivers/zink/zink_program.h
View File

@@ -32,11 +32,15 @@ struct zink_screen;
struct zink_shader; struct zink_shader;
struct zink_gfx_pipeline_state; struct zink_gfx_pipeline_state;
struct hash_table;
struct set;
struct zink_gfx_program { struct zink_gfx_program {
struct zink_shader *stages[PIPE_SHADER_TYPES - 1]; // compute stage doesn't belong here struct zink_shader *stages[PIPE_SHADER_TYPES - 1]; // compute stage doesn't belong here
VkDescriptorSetLayout dsl; VkDescriptorSetLayout dsl;
VkPipelineLayout layout; VkPipelineLayout layout;
struct hash_table *pipelines[PIPE_PRIM_TRIANGLE_FAN + 1]; struct hash_table *pipelines[PIPE_PRIM_TRIANGLE_FAN + 1];
struct set *render_passes;
}; };
struct zink_gfx_program * struct zink_gfx_program *