From 4caf3fc8df023ca5facdb4120c6a4344ddba7ab1 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 23 Dec 2019 11:00:16 +1100 Subject: [PATCH] glsl: reorder link_and_validate_uniforms() calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required for the following commit. Reviewed-by: Alejandro Piñeiro --- src/compiler/glsl/linker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 81f28524429..63f4b46bd6b 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4533,11 +4533,11 @@ link_and_validate_uniforms(struct gl_context *ctx, if (prog->data->LinkStatus == LINKING_FAILURE) return; - link_assign_atomic_counter_resources(ctx, prog); link_calculate_subroutine_compat(prog); check_resources(ctx, prog); check_subroutine_resources(prog); check_image_resources(ctx, prog); + link_assign_atomic_counter_resources(ctx, prog); link_check_atomic_counter_resources(ctx, prog); }