From 7efb2350199f7ea5acbadb76a1a19eda75b45a45 Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Fri, 11 Sep 2015 12:31:10 +0200 Subject: [PATCH] glsl: use correct number of uniform blocks in error message Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Timothy Arceri --- src/glsl/linker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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++) { -- 2.30.2