fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: gfx_pipeline_cache_entry -> zink_gfx_pipeline_cache_entry

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18961>
This commit is contained in:
Mike Blumenkrantz 2022-10-02 08:11:30 -04:00 • committed by Marge Bot
parent b38cb40fdb
commit b54929ac27
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/zink/zink_program.c
View file

@ -1147,7 +1147,7 @@ zink_destroy_gfx_program(struct zink_screen *screen,
for (unsigned r = 0; r < ARRAY_SIZE(prog->pipelines); r++) {
for (int i = 0; i < max_idx; ++i) {
hash_table_foreach(&prog->pipelines[r][i], entry) {
struct gfx_pipeline_cache_entry *pc_entry = entry->data;
struct zink_gfx_pipeline_cache_entry *pc_entry = entry->data;
VKSCR(DestroyPipeline)(screen->dev, pc_entry->pipeline, NULL);
free(pc_entry);

9
src/gallium/drivers/zink/zink_program.h
View file

@ -30,15 +30,6 @@ extern "C" {
#endif
#include "util/u_prim.h"
struct gfx_pipeline_cache_entry {
struct zink_gfx_pipeline_state state;
VkPipeline pipeline;
/* GPL only */
struct zink_gfx_input_key *ikey;
struct zink_gfx_library_key *gkey;
struct zink_gfx_output_key *okey;
};
struct compute_pipeline_cache_entry {
struct zink_compute_pipeline_state state;
VkPipeline pipeline;

4
src/gallium/drivers/zink/zink_program_state.hpp
View file

@ -217,7 +217,7 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
if (!entry) {
util_queue_fence_wait(&prog->base.cache_fence);
VkPipeline pipeline = VK_NULL_HANDLE;
struct gfx_pipeline_cache_entry *pc_entry = CALLOC_STRUCT(gfx_pipeline_cache_entry);
struct zink_gfx_pipeline_cache_entry *pc_entry = CALLOC_STRUCT(zink_gfx_pipeline_cache_entry);
if (!pc_entry)
return VK_NULL_HANDLE;
memcpy(&pc_entry->state, state, sizeof(*state));
@ -256,7 +256,7 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
pc_entry->pipeline = pipeline;
}
struct gfx_pipeline_cache_entry *cache_entry = (struct gfx_pipeline_cache_entry *)entry->data;
struct zink_gfx_pipeline_cache_entry *cache_entry = (struct zink_gfx_pipeline_cache_entry *)entry->data;
state->pipeline = cache_entry->pipeline;
if (DYNAMIC_STATE >= ZINK_DYNAMIC_VERTEX_INPUT) {
prog->last_finalized_hash[rp_idx][idx] = state->final_hash;

9
src/gallium/drivers/zink/zink_types.h
View file

@ -826,6 +826,15 @@ struct zink_gfx_output_key {
VkPipeline pipeline;
};
struct zink_gfx_pipeline_cache_entry {
struct zink_gfx_pipeline_state state;
VkPipeline pipeline;
/* GPL only */
struct zink_gfx_input_key *ikey;
struct zink_gfx_library_key *gkey;
struct zink_gfx_output_key *okey;
};
struct zink_gfx_program {
struct zink_program base;