Mesa (master): glsl: make linker error message more informative
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu Aug 13 11:57:37 UTC 2015
Module: Mesa
Branch: master
Commit: b8f63b3c1002eea9cc6d54191bd41ea43c467e96
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b8f63b3c1002eea9cc6d54191bd41ea43c467e96
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Wed Aug 12 17:01:52 2015 +1000
glsl: make linker error message more informative
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/glsl/linker.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index d7efea5..a7cd820 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2880,8 +2880,9 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog)
if (sh) {
if (sh->NumImages > ctx->Const.Program[i].MaxImageUniforms)
- linker_error(prog, "Too many %s shader image uniforms\n",
- _mesa_shader_stage_to_string(i));
+ linker_error(prog, "Too many %s shader image uniforms (%u > %u)\n",
+ _mesa_shader_stage_to_string(i), sh->NumImages,
+ ctx->Const.Program[i].MaxImageUniforms);
total_image_units += sh->NumImages;
More information about the mesa-commit
mailing list