diff options
| author | Eric Anholt <eric@anholt.net> | 2013-11-14 17:40:46 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-05 10:50:53 -0800 |
| commit | 6e926b18ca1b182253bac435a1d53caaff7ffff6 (patch) | |
| tree | 1511c4fa1e36f634c6cf761d04863aa82ebaaa18 | |
| parent | 57a8ce927332e855dd29ff30210a211a907adb25 (diff) | |
glx: Fix incorrect use of dri_interface.h version defines in extensions.
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>
| -rw-r--r-- | glx/glxdri2.c | 4 | ||||
| -rw-r--r-- | glx/glxdricommon.c | 2 | ||||
| -rw-r--r-- | glx/glxdriswrast.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/glx/glxdri2.c b/glx/glxdri2.c index e245e81ae..a7ee4a3f5 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -773,7 +773,7 @@ dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate) } static const __DRIdri2LoaderExtension loaderExtension = { - {__DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION}, + {__DRI_DRI2_LOADER, 3}, dri2GetBuffers, dri2FlushFrontBuffer, dri2GetBuffersWithFormat, @@ -781,7 +781,7 @@ static const __DRIdri2LoaderExtension loaderExtension = { #ifdef __DRI_USE_INVALIDATE static const __DRIuseInvalidateExtension dri2UseInvalidate = { - {__DRI_USE_INVALIDATE, __DRI_USE_INVALIDATE_VERSION} + {__DRI_USE_INVALIDATE, 1} }; #endif diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 1022c0075..fc902729d 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -59,7 +59,7 @@ getUST(int64_t * ust) } const __DRIsystemTimeExtension systemTimeExtension = { - {__DRI_SYSTEM_TIME, __DRI_SYSTEM_TIME_VERSION}, + {__DRI_SYSTEM_TIME, 1}, getUST, NULL, }; diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index c9962dc81..aa083e053 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -386,7 +386,7 @@ swrastGetImage(__DRIdrawable * draw, } static const __DRIswrastLoaderExtension swrastLoaderExtension = { - {__DRI_SWRAST_LOADER, __DRI_SWRAST_LOADER_VERSION}, + {__DRI_SWRAST_LOADER, 1}, swrastGetDrawableInfo, swrastPutImage, swrastGetImage |