From 3f6996acfd747d9c36e5d1a99418f0a9d8e458a6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 13 Apr 2021 17:35:49 -0400 Subject: [PATCH] glx: Generalize __glXGetStringFromTable a little MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the second argument optional, and treat its absence as if the filter always matches. Reviewed-by: Marek Olšák Part-of: --- src/glx/glxextensions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c index 286075297b2..8bfe89b66f5 100644 --- a/src/glx/glxextensions.c +++ b/src/glx/glxextensions.c @@ -658,7 +658,7 @@ __glExtensionBitIsEnabled(struct glx_context *gc, unsigned bit) */ static char * __glXGetStringFromTable(const struct extension_info *ext, - const unsigned char *supported) + const unsigned char *filter) { unsigned i; unsigned ext_str_len; @@ -668,7 +668,7 @@ __glXGetStringFromTable(const struct extension_info *ext, ext_str_len = 0; for (i = 0; ext[i].name != NULL; i++) { - if (EXT_ENABLED(ext[i].bit, supported)) { + if (!filter || EXT_ENABLED(ext[i].bit, filter)) { ext_str_len += ext[i].name_len + 1; } } @@ -678,7 +678,7 @@ __glXGetStringFromTable(const struct extension_info *ext, point = ext_str; for (i = 0; ext[i].name != NULL; i++) { - if (EXT_ENABLED(ext[i].bit, supported)) { + if (!filter || EXT_ENABLED(ext[i].bit, filter)) { (void) memcpy(point, ext[i].name, ext[i].name_len); point += ext[i].name_len;