From 75982a5df42cd2406e529b7c96b36d2a8b1f7b60 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 8 Nov 2013 09:00:46 -0700 Subject: [PATCH] glx: change query_renderer_integer() value param to unsigned When this function was added, the returned value was signed in some places, unsigned in others. v2: also add unsigned in the unit test, per Ian. Reviewed-by: Ian Romanick --- src/glx/glxclient.h | 2 +- src/glx/query_renderer.c | 2 +- src/glx/tests/query_renderer_unittest.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index e26a83eba9e..e33dba6a8fb 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -477,7 +477,7 @@ struct glx_screen_vtable { unsigned *error); int (*query_renderer_integer)(struct glx_screen *psc, int attribute, - int *value); + unsigned int *value); int (*query_renderer_string)(struct glx_screen *psc, int attribute, const char **value); diff --git a/src/glx/query_renderer.c b/src/glx/query_renderer.c index 981a844e94e..9108ec23af5 100644 --- a/src/glx/query_renderer.c +++ b/src/glx/query_renderer.c @@ -30,7 +30,7 @@ __glXQueryRendererInteger(struct glx_screen *psc, int attribute, unsigned int *value) { unsigned int values_for_query = 0; - int buffer[32]; + unsigned int buffer[32]; int err; /* This probably means the caller is trying to use an extension function diff --git a/src/glx/tests/query_renderer_unittest.cpp b/src/glx/tests/query_renderer_unittest.cpp index f0998b7d7dc..2f3c4ef12ea 100644 --- a/src/glx/tests/query_renderer_unittest.cpp +++ b/src/glx/tests/query_renderer_unittest.cpp @@ -56,7 +56,8 @@ static bool query_renderer_string_called = false; static bool query_renderer_integer_called = false; static int -fake_query_renderer_integer(struct glx_screen *psc, int attribute, int *value) +fake_query_renderer_integer(struct glx_screen *psc, int attribute, + unsigned int *value) { (void) psc; (void) attribute; -- 2.30.2