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 <ian.d.romanick@intel.com>

diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index e26a83eba9eff49edb8ecddada9e8bb2da6e891d..e33dba6a8fb39512f13d64ddf6083888b41f0ca5 100644 (file)
--- 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 981a844e94e5e6ac226c58c538688ed70e186af7..9108ec23af536d5cadd1f2e42b611ba4964872f6 100644 (file)
--- 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 f0998b7d7dc477d43df1197056e0ae6b656df75e..2f3c4ef12eac30582f440a78016969c548c786c0 100644 (file)
--- 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;