From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 23 Dec 2019 00:00:16 +0000 (+1100)
Subject: glsl: reorder link_and_validate_uniforms() calls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4caf3fc8df023ca5facdb4120c6a4344ddba7ab1;p=mesa.git

glsl: reorder link_and_validate_uniforms() calls

This is required for the following commit.

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

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