andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glx: Fix incorrect use of dri_interface.h version defines in extensions.

Browse Source 
Those defines are so you can compile-time check "do I have a
dri_interface.h that defines this new field of the struct?"  You don't
want the server to claim it implements the new struct just because you
installed a new copy of Mesa.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Eric Anholt 2013-11-14 17:40:46 -08:00 committed by Keith Packard
parent 57a8ce9273
commit 6e926b18ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxdri2.c
View File

@ -773,7 +773,7 @@ dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate)
} }
static const __DRIdri2LoaderExtension loaderExtension = { static const __DRIdri2LoaderExtension loaderExtension = {
{__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION}, {__DRI_DRI2_LOADER, 3},
dri2GetBuffers, dri2GetBuffers,
dri2FlushFrontBuffer, dri2FlushFrontBuffer,
dri2GetBuffersWithFormat, dri2GetBuffersWithFormat,
@ -781,7 +781,7 @@ static const __DRIdri2LoaderExtension loaderExtension = {
#ifdef __DRI_USE_INVALIDATE #ifdef __DRI_USE_INVALIDATE
static const __DRIuseInvalidateExtension dri2UseInvalidate = { static const __DRIuseInvalidateExtension dri2UseInvalidate = {
{__DRI_USE_INVALIDATE, __DRI_USE_INVALIDATE_VERSION} {__DRI_USE_INVALIDATE, 1}
}; };
#endif #endif

2
glx/glxdricommon.c
View File

@ -59,7 +59,7 @@ getUST(int64_t * ust)
} }
const __DRIsystemTimeExtension systemTimeExtension = { const __DRIsystemTimeExtension systemTimeExtension = {
{__DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION}, {__DRI_SYSTEM_TIME, 1},
getUST, getUST,
NULL, NULL,
}; };

2
glx/glxdriswrast.c
View File

@ -386,7 +386,7 @@ swrastGetImage(__DRIdrawable * draw,
} }
static const __DRIswrastLoaderExtension swrastLoaderExtension = { static const __DRIswrastLoaderExtension swrastLoaderExtension = {
{__DRI_SWRAST_LOADER, __DRI_SWRAST_LOADER_VERSION}, {__DRI_SWRAST_LOADER, 1},
swrastGetDrawableInfo, swrastGetDrawableInfo,
swrastPutImage, swrastPutImage,
swrastGetImage swrastGetImage