From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Wed, 11 Dec 2019 04:48:32 +0000 (+1100)
Subject: glsl: rename gl_nir_link() to gl_nir_link_spirv()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=432ed13decc3b246deb6dc98e638819deec1b5d3;p=mesa.git

glsl: rename gl_nir_link() to gl_nir_link_spirv()

A NIR based glsl linking function will be too different to the
spirv version to bother attempting any sharing. So lets change
the name to be explicit.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
---

diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index 5ad590726f1..07aab9091db 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -567,8 +567,8 @@ nir_build_program_resource_list(struct gl_context *ctx,
 }
 
 bool
-gl_nir_link(struct gl_context *ctx, struct gl_shader_program *prog,
-            const struct gl_nir_linker_options *options)
+gl_nir_link_spirv(struct gl_context *ctx, struct gl_shader_program *prog,
+                  const struct gl_nir_linker_options *options)
 {
    if (!gl_nir_link_uniform_blocks(ctx, prog))
       return false;
diff --git a/src/compiler/glsl/gl_nir_linker.h b/src/compiler/glsl/gl_nir_linker.h
index bc7b053119c..944f7744adb 100644
--- a/src/compiler/glsl/gl_nir_linker.h
+++ b/src/compiler/glsl/gl_nir_linker.h
@@ -35,9 +35,9 @@ struct gl_nir_linker_options {
    bool fill_parameters;
 };
 
-bool gl_nir_link(struct gl_context *ctx,
-                 struct gl_shader_program *prog,
-                 const struct gl_nir_linker_options *options);
+bool gl_nir_link_spirv(struct gl_context *ctx,
+                       struct gl_shader_program *prog,
+                       const struct gl_nir_linker_options *options);
 
 bool gl_nir_link_uniforms(struct gl_context *ctx,
                           struct gl_shader_program *prog,
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp
index c77b696e6a7..2a844575c3d 100644
--- a/src/mesa/drivers/dri/i965/brw_link.cpp
+++ b/src/mesa/drivers/dri/i965/brw_link.cpp
@@ -272,7 +272,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
       static const gl_nir_linker_options opts = {
          .fill_parameters = false,
       };
-      if (!gl_nir_link(ctx, shProg, &opts))
+      if (!gl_nir_link_spirv(ctx, shProg, &opts))
          return GL_FALSE;
    }
 
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 3663410ae1b..11b6db490b9 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -705,7 +705,7 @@ st_link_nir(struct gl_context *ctx,
       static const gl_nir_linker_options opts = {
          true /*fill_parameters */
       };
-      if (!gl_nir_link(ctx, shader_program, &opts))
+      if (!gl_nir_link_spirv(ctx, shader_program, &opts))
          return GL_FALSE;
 
       nir_build_program_resource_list(ctx, shader_program, true);