Mesa (master): glsl: reorder link_and_validate_uniforms() calls

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4caf3fc8df023ca5facdb4120c6a4344ddba7ab1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4caf3fc8df023ca5facdb4120c6a4344ddba7ab1

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Dec 23 11:00:16 2019 +1100

glsl: reorder link_and_validate_uniforms() calls

This is required for the following commit.

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>

---

 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);
 }