Mesa (master): glsl: use correct number of uniform blocks in error message
Samuel Iglesias Gonsálvez
samuelig at kemper.freedesktop.org
Tue Sep 29 08:05:23 UTC 2015
Module: Mesa
Branch: master
Commit: 7efb2350199f7ea5acbadb76a1a19eda75b45a45
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7efb2350199f7ea5acbadb76a1a19eda75b45a45
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date: Fri Sep 11 12:31:10 2015 +0200
glsl: use correct number of uniform blocks in error message
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
---
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 9bacd22..87c7d4b 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++) {
More information about the mesa-commit
mailing list