crocus: rename genX proto functions to avoid iris conflicts.

If we start adding gen8, then conflicts occur, but the crocus
ones into their own namespace to avoid this.

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

diff --git a/src/gallium/drivers/crocus/crocus_blorp.c b/src/gallium/drivers/crocus/crocus_blorp.c
index 75f0078..060f5a8 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_blorp.c
+++ b/src/gallium/drivers/crocus/crocus_blorp.c
@@ -252,7 +252,7 @@ blorp_emit_urb_config(struct blorp_batch *blorp_batch,
 #if GFX_VER <= 5
    batch->screen->vtbl.calculate_urb_fence(batch, 0, vs_entry_size, sf_entry_size);
 #else
-   genX(upload_urb)(batch, vs_entry_size, false, vs_entry_size);
+   genX(crocus_upload_urb)(batch, vs_entry_size, false, vs_entry_size);
 #endif
 }
 #endif
@@ -387,7 +387,7 @@ blorp_measure_start(struct blorp_batch *blorp_batch,
 }
 
 void
-genX(init_blorp)(struct crocus_context *ice)
+genX(crocus_init_blorp)(struct crocus_context *ice)
 {
    struct crocus_screen *screen = (struct crocus_screen *)ice->ctx.screen;
 

diff --git a/src/gallium/drivers/crocus/crocus_blt.c b/src/gallium/drivers/crocus/crocus_blt.c
index d278913..96bb005 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_blt.c
+++ b/src/gallium/drivers/crocus/crocus_blt.c
@@ -325,7 +325,7 @@ static bool crocus_copy_region_blt(struct crocus_batch *batch,
 #endif
 
 void
-genX(init_blt)(struct crocus_screen *screen)
+genX(crocus_init_blt)(struct crocus_screen *screen)
 {
 #if GFX_VER <= 5
    screen->vtbl.blit_blt = crocus_blit_blt;

diff --git a/src/gallium/drivers/crocus/crocus_context.c b/src/gallium/drivers/crocus/crocus_context.c
index cd8a54d..7d3d007 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_context.c
+++ b/src/gallium/drivers/crocus/crocus_context.c
@@ -290,9 +290,9 @@ crocus_create_context(struct pipe_screen *pscreen, void *priv, unsigned flags)
    if (!crocus_init_identifier_bo(ice))
       return NULL;
 
-   genX_call(devinfo, init_state, ice);
-   genX_call(devinfo, init_blorp, ice);
-   genX_call(devinfo, init_query, ice);
+   genX_call(devinfo, crocus_init_state, ice);
+   genX_call(devinfo, crocus_init_blorp, ice);
+   genX_call(devinfo, crocus_init_query, ice);
 
    ice->blitter = util_blitter_create(&ice->ctx);
    if (ice->blitter == NULL)

diff --git a/src/gallium/drivers/crocus/crocus_genx_protos.h b/src/gallium/drivers/crocus/crocus_genx_protos.h
index b246f2a..15f8e0f 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_genx_protos.h
+++ b/src/gallium/drivers/crocus/crocus_genx_protos.h
@@ -28,19 +28,19 @@
  */
 
 /* crocus_state.c */
-void genX(init_state)(struct crocus_context *ice);
-void genX(init_screen_state)(struct crocus_screen *screen);
-void genX(upload_urb)(struct crocus_batch *batch,
+void genX(crocus_init_state)(struct crocus_context *ice);
+void genX(crocus_init_screen_state)(struct crocus_screen *screen);
+void genX(crocus_upload_urb)(struct crocus_batch *batch,
                       unsigned vs_size,
                       bool gs_present,
                       unsigned gs_size);
 
 /* crocus_blorp.c */
-void genX(init_blorp)(struct crocus_context *ice);
+void genX(crocus_init_blorp)(struct crocus_context *ice);
 
 /* crocus_query.c */
-void genX(init_query)(struct crocus_context *ice);
-void genX(init_screen_query)(struct crocus_screen *screen);
+void genX(crocus_init_query)(struct crocus_context *ice);
+void genX(crocus_init_screen_query)(struct crocus_screen *screen);
 
 /* crocus_blt.c */
-void genX(init_blt)(struct crocus_screen *screen);
+void genX(crocus_init_blt)(struct crocus_screen *screen);

diff --git a/src/gallium/drivers/crocus/crocus_query.c b/src/gallium/drivers/crocus/crocus_query.c
index 14ba9fb..d66e9bb 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_query.c
+++ b/src/gallium/drivers/crocus/crocus_query.c
@@ -968,7 +968,7 @@ crocus_emit_compute_predicate(struct crocus_batch *batch)
 #endif
 
 void
-genX(init_screen_query)(struct crocus_screen *screen)
+genX(crocus_init_screen_query)(struct crocus_screen *screen)
 {
    screen->vtbl.resolve_conditional_render = crocus_resolve_conditional_render;
 #if GFX_VER >= 7
@@ -977,7 +977,7 @@ genX(init_screen_query)(struct crocus_screen *screen)
 }
 
 void
-genX(init_query)(struct crocus_context *ice)
+genX(crocus_init_query)(struct crocus_context *ice)
 {
    struct pipe_context *ctx = &ice->ctx;
 

diff --git a/src/gallium/drivers/crocus/crocus_screen.c b/src/gallium/drivers/crocus/crocus_screen.c
index 75713bd..05e3d06 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_screen.c
+++ b/src/gallium/drivers/crocus/crocus_screen.c
@@ -845,7 +845,7 @@ crocus_screen_create(int fd, const struct pipe_screen_config *config)
    pscreen->get_driver_query_group_info = crocus_get_monitor_group_info;
    pscreen->get_driver_query_info = crocus_get_monitor_info;
 
-   genX_call(&screen->devinfo, init_screen_state, screen);
-   genX_call(&screen->devinfo, init_screen_query, screen);
+   genX_call(&screen->devinfo, crocus_init_screen_state, screen);
+   genX_call(&screen->devinfo, crocus_init_screen_query, screen);
    return pscreen;
 }

diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index 7ef5807..90cf12e 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -5478,7 +5478,7 @@ crocus_upload_dirty_render_state(struct crocus_context *ice,
          gs_size = gs_vue_prog_data->urb_entry_size;
       }
 
-      genX(upload_urb)(batch, vs_size, gs_present, gs_size);
+      genX(crocus_upload_urb)(batch, vs_size, gs_present, gs_size);
 #endif
 #if GFX_VER == 7
       const struct intel_device_info *devinfo = &batch->screen->devinfo;
@@ -8010,10 +8010,10 @@ crocus_emit_raw_pipe_control(struct crocus_batch *batch,
 
 #if GFX_VER == 6
 void
-genX(upload_urb)(struct crocus_batch *batch,
-                 unsigned vs_size,
-                 bool gs_present,
-                 unsigned gs_size)
+genX(crocus_upload_urb)(struct crocus_batch *batch,
+                        unsigned vs_size,
+                        bool gs_present,
+                        unsigned gs_size)
 {
    struct crocus_context *ice = batch->ice;
    int nr_vs_entries, nr_gs_entries;
@@ -8261,7 +8261,7 @@ crocus_set_frontend_noop(struct pipe_context *ctx, bool enable)
 }
 
 void
-genX(init_screen_state)(struct crocus_screen *screen)
+genX(crocus_init_screen_state)(struct crocus_screen *screen)
 {
    assert(screen->devinfo.verx10 == GFX_VERx10);
    screen->vtbl.destroy_state = crocus_destroy_state;
@@ -8314,11 +8314,11 @@ genX(init_screen_state)(struct crocus_screen *screen)
    screen->vtbl.get_so_offset = crocus_get_so_offset;
 #endif
 
-   genX(init_blt)(screen);
+   genX(crocus_init_blt)(screen);
 }
 
 void
-genX(init_state)(struct crocus_context *ice)
+genX(crocus_init_state)(struct crocus_context *ice)
 {
    struct pipe_context *ctx = &ice->ctx;