zink: gfx_pipeline_cache_entry -> zink_gfx_pipeline_cache_entry

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18961>

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 3751a86..c1a183b 100644 (file)
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -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);

diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index 335f1bb..7cabc4b 100644 (file)
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -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;

diff --git a/src/gallium/drivers/zink/zink_program_state.hpp b/src/gallium/drivers/zink/zink_program_state.hpp
index ae52a9b..fe6ab93 100644 (file)
--- a/src/gallium/drivers/zink/zink_program_state.hpp
+++ b/src/gallium/drivers/zink/zink_program_state.hpp
@@ -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;

diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h
index 7e1465f..3c5b431 100644 (file)
--- a/src/gallium/drivers/zink/zink_types.h
+++ b/src/gallium/drivers/zink/zink_types.h
@@ -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;