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

glsl: use nir version of check_image_resources() for nir linker

Browse Source 
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
Timothy Arceri
2020-01-03 15:12:59 +11:00
parent feffd1fa65
commit 3bd4bcd418
2 changed files with 2 additions and 1 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)
{ {
check_image_resources(ctx, prog);
gl_nir_link_assign_atomic_counter_resources(ctx, prog); gl_nir_link_assign_atomic_counter_resources(ctx, prog);
gl_nir_link_check_atomic_counter_resources(ctx, prog); gl_nir_link_check_atomic_counter_resources(ctx, prog);

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

@@ -4536,9 +4536,9 @@ link_and_validate_uniforms(struct gl_context *ctx,
link_calculate_subroutine_compat(prog); link_calculate_subroutine_compat(prog);
check_resources(ctx, prog); check_resources(ctx, prog);
check_subroutine_resources(prog); check_subroutine_resources(prog);
check_image_resources(ctx, prog);
if (!ctx->Const.UseNIRGLSLLinker) { if (!ctx->Const.UseNIRGLSLLinker) {
check_image_resources(ctx, prog);
link_assign_atomic_counter_resources(ctx, prog); link_assign_atomic_counter_resources(ctx, prog);
link_check_atomic_counter_resources(ctx, prog); link_check_atomic_counter_resources(ctx, prog);
} }