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

glsl/linker: get rid of gl_context from atomic counters paths

Browse Source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14433>
This commit is contained in:
Dave Airlie
2022-01-07 11:08:33 +10:00
committed by Marge Bot
parent e9ec1429ba
commit 4d6e866b7b
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,7 +621,7 @@ gl_nir_link_spirv(struct gl_context *ctx, struct gl_shader_program *prog,
if (!gl_nir_link_uniforms(ctx, prog, options->fill_parameters))
return false;
gl_nir_link_assign_atomic_counter_resources(ctx, prog);
gl_nir_link_assign_atomic_counter_resources(&ctx->Const, prog);
gl_nir_link_assign_xfb_resources(ctx, prog);
return true;
@@ -687,8 +687,8 @@ gl_nir_link_glsl(struct gl_context *ctx, struct gl_shader_program *prog)
link_util_check_uniform_resources(&ctx->Const, prog);
link_util_check_subroutine_resources(prog);
check_image_resources(ctx, prog);
gl_nir_link_assign_atomic_counter_resources(ctx, prog);
gl_nir_link_check_atomic_counter_resources(ctx, prog);
gl_nir_link_assign_atomic_counter_resources(&ctx->Const, prog);
gl_nir_link_check_atomic_counter_resources(&ctx->Const, prog);
if (prog->data->LinkStatus == LINKING_FAILURE)
return false;