[Mesa-dev] [PATCH 4/4] glxinfo/wglinfo: improve GL_ARB_imaging query code

[Brian Paul]

Print GL_MAX_CONVOLUTION_WIDTH, HEIGHT on separate lines.
Print GL_MAX_COLOR_MATRIX_STACK_DEPTH in same section.
---
 src/xdemos/glinfo_common.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
index f84d1a4..508fce1 100644
--- a/src/xdemos/glinfo_common.c
+++ b/src/xdemos/glinfo_common.c
@@ -464,7 +464,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
       { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH", NULL },
       { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", NULL },
       { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES", NULL },
-      { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH", "GL_ARB_imaging" },
       { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES", NULL },
       { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES", NULL },
       { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER", NULL },
@@ -716,12 +715,16 @@ print_limits(const char *extensions, const char *oglstring, int version,
 
    /* these don't fit into the above mechanism, unfortunately */
    if (extension_supported("GL_ARB_imaging", extensions)) {
+      GLint d;
+      printf("  GL_ARB_imaging:\n");
       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
-                                          GL_MAX_CONVOLUTION_WIDTH, max);
+                                          GL_MAX_CONVOLUTION_WIDTH, &d);
+      printf("    GL_MAX_CONVOLUTION_WIDTH = %d\n", d);
       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
-                                          GL_MAX_CONVOLUTION_HEIGHT, max+1);
-      printf("  GL_ARB_imaging:\n");
-      printf("    GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
+                                          GL_MAX_CONVOLUTION_HEIGHT, &d);
+      printf("    GL_MAX_CONVOLUTION_HEIGHT = %d\n", d);
+      glGetIntegerv(GL_MAX_COLOR_MATRIX_STACK_DEPTH, &d);
+      printf("    GL_MAX_COLOR_MATRIX_STACK_DEPTH = %d\n", d);
    }
 
    if (extension_supported("GL_ARB_texture_compression", extensions)) {
-- 
2.7.4