OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: rename gl_nir_link() to gl_nir_link_spirv()

Browse Source 
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>
This commit is contained in:
Timothy Arceri
2019-12-11 15:48:32 +11:00
parent 6c1c13e90e
commit 432ed13dec
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/gl_nir_linker.c
View File

@@ -567,7 +567,7 @@ nir_build_program_resource_list(struct gl_context *ctx,
} }
bool bool
gl_nir_link(struct gl_context *ctx, struct gl_shader_program *prog, gl_nir_link_spirv(struct gl_context *ctx, struct gl_shader_program *prog,
const struct gl_nir_linker_options *options) const struct gl_nir_linker_options *options)
{ {
if (!gl_nir_link_uniform_blocks(ctx, prog)) if (!gl_nir_link_uniform_blocks(ctx, prog))

2
src/compiler/glsl/gl_nir_linker.h
View File

@@ -35,7 +35,7 @@ struct gl_nir_linker_options {
bool fill_parameters; bool fill_parameters;
}; };
bool gl_nir_link(struct gl_context *ctx, bool gl_nir_link_spirv(struct gl_context *ctx,
struct gl_shader_program *prog, struct gl_shader_program *prog,
const struct gl_nir_linker_options *options); const struct gl_nir_linker_options *options);

2
src/mesa/drivers/dri/i965/brw_link.cpp
View File

@@ -272,7 +272,7 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
static const gl_nir_linker_options opts = { static const gl_nir_linker_options opts = {
.fill_parameters = false, .fill_parameters = false,
}; };
if (!gl_nir_link(ctx, shProg, &opts)) if (!gl_nir_link_spirv(ctx, shProg, &opts))
return GL_FALSE; return GL_FALSE;
} }

2
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -705,7 +705,7 @@ st_link_nir(struct gl_context *ctx,
static const gl_nir_linker_options opts = { static const gl_nir_linker_options opts = {
true /*fill_parameters */ true /*fill_parameters */
}; };
if (!gl_nir_link(ctx, shader_program, &opts)) if (!gl_nir_link_spirv(ctx, shader_program, &opts))
return GL_FALSE; return GL_FALSE;
nir_build_program_resource_list(ctx, shader_program, true); nir_build_program_resource_list(ctx, shader_program, true);