summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2019-12-11 15:48:32 +1100
committerTimothy Arceri <[email protected]>2020-01-07 08:38:41 +1100
commit432ed13decc3b246deb6dc98e638819deec1b5d3 (patch)
treed6235f8d38696d3c3e88f484075888e11ab4a61e
parent6c1c13e90e67c716ff97ba8c45a5a04c2b57b4a2 (diff)
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 <[email protected]>
-rw-r--r--src/compiler/glsl/gl_nir_linker.c4
-rw-r--r--src/compiler/glsl/gl_nir_linker.h6
-rw-r--r--src/mesa/drivers/dri/i965/brw_link.cpp2
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp2
4 files changed, 7 insertions, 7 deletions
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);