glsl: reorder link_and_validate_uniforms() calls
authorTimothy Arceri <tarceri@itsqueeze.com>
Mon, 23 Dec 2019 00:00:16 +0000 (11:00 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Mon, 6 Jan 2020 21:39:34 +0000 (08:39 +1100)
This is required for the following commit.

Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
src/compiler/glsl/linker.cpp

index 81f285244295ad6219d2abd1a86ae8cfe0fed5d4..63f4b46bd6b00921c98bc4909225190ddeedb410 100644 (file)
@@ -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);
 }