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

glsl: call calculate_subroutine_compat() from the nir linker

Browse Source 
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Timothy Arceri
2020-01-07 13:49:50 +11:00
parent 726e8f24c6
commit 87e0dd68f5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -623,6 +623,7 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog)
bool bool
gl_nir_link_glsl(struct gl_context *ctx, struct gl_shader_program *prog) gl_nir_link_glsl(struct gl_context *ctx, struct gl_shader_program *prog)
{ {
link_util_calculate_subroutine_compat(prog);
link_util_check_uniform_resources(ctx, prog); link_util_check_uniform_resources(ctx, prog);
link_util_check_subroutine_resources(prog); link_util_check_subroutine_resources(prog);
check_image_resources(ctx, prog); check_image_resources(ctx, prog);

3
src/compiler/glsl/linker.cpp
View File

@@ -4404,9 +4404,8 @@ link_and_validate_uniforms(struct gl_context *ctx,
if (prog->data->LinkStatus == LINKING_FAILURE) if (prog->data->LinkStatus == LINKING_FAILURE)
return; return;
link_util_calculate_subroutine_compat(prog);
if (!ctx->Const.UseNIRGLSLLinker) { if (!ctx->Const.UseNIRGLSLLinker) {
link_util_calculate_subroutine_compat(prog);
link_util_check_uniform_resources(ctx, prog); link_util_check_uniform_resources(ctx, prog);
link_util_check_subroutine_resources(prog); link_util_check_subroutine_resources(prog);
check_image_resources(ctx, prog); check_image_resources(ctx, prog);