diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
| commit | 9837797b353b2e24e7ac96d3a74159497410c21a (patch) | |
| tree | 3d4b6d9eb5e91d8b838610c1a04d738ad7f8ced4 /mesalib/src/mesa/drivers/dri | |
| parent | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (diff) | |
| parent | 4c9f1ba041644329543e4ca21c0d95cf872f988e (diff) | |
| download | vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.gz vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.bz2 vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver git update 14 nov 2013
Diffstat (limited to 'mesalib/src/mesa/drivers/dri')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c index b30fca903..9c9483209 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.c +++ b/mesalib/src/mesa/drivers/dri/common/utils.c @@ -494,7 +494,7 @@ driIndexConfigAttrib(const __DRIconfig *config, int index, * Zero if a recognized value of \c param is supplied, -1 otherwise. */ int -driQueryRendererIntegerCommon(__DRIscreen *psp, int param, int *value) +driQueryRendererIntegerCommon(__DRIscreen *psp, int param, unsigned int *value) { switch (param) { case __DRI2_RENDERER_VERSION: { diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h index 5d6ef879e..22af123c3 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.h +++ b/mesalib/src/mesa/drivers/dri/common/utils.h @@ -66,6 +66,6 @@ driIndexConfigAttrib(const __DRIconfig *config, int index, unsigned int *attrib, unsigned int *value); int -driQueryRendererIntegerCommon(__DRIscreen *psp, int param, int *value); +driQueryRendererIntegerCommon(__DRIscreen *psp, int param, unsigned int *value); #endif /* DRI_DEBUG_H */ |