From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Date: Fri, 11 Sep 2015 10:31:10 +0000 (+0200)
Subject: glsl: use correct number of uniform blocks in error message
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7efb2350199f7ea5acbadb76a1a19eda75b45a45;p=mesa.git

glsl: use correct number of uniform blocks in error message

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9bacd22b9d4..87c7d4b087b 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2836,7 +2836,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog)
 
       if (total_uniform_blocks > ctx->Const.MaxCombinedUniformBlocks) {
 	 linker_error(prog, "Too many combined uniform blocks (%d/%d)\n",
-		      prog->NumBufferInterfaceBlocks,
+		      total_uniform_blocks,
 		      ctx->Const.MaxCombinedUniformBlocks);
       } else {
 	 for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {