dri_interface: Update __DRItexBufferExtensionRec to version 3
authorEmil Velikov <emil.l.velikov@gmail.com>
Tue, 18 Feb 2014 03:04:03 +0000 (03:04 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 28 Apr 2014 18:11:27 +0000 (19:11 +0100)
commit9b42fd1772b13b10f397d80d11aa8351e6313085
treef9c4028a8105c3aa8a7ec57c261aef753d34a4a1
parentec8ebff342839138bc8141b8a739d9bce6d7ac39
dri_interface: Update __DRItexBufferExtensionRec to version 3

With commit e59fa4c46c8("dri2: release texture image.") we updated the
extension without bumping the version number. The patch itself added an
interface required to enable texture_from_pixmap on certain platforms.

The new code was effectively never build, as it depended on
__DRI_TEX_BUFFER_VERSION >= 3, which never came to be in upstream mesa.

This commit bumps the version number, drops the __DRI_TEX_BUFFER_VERSION
checks and resolves all the build conflicts. Additionally it add a version
check as egl and dri3, as require version 2 of the extension which does
not have the releaseTexBuffer hook.

Cc: Juan Zhao <juan.j.zhao@intel.com>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
include/GL/internal/dri_interface.h
src/egl/drivers/dri2/egl_dri2.c
src/egl/main/eglsurface.c
src/egl/main/eglsurface.h
src/glx/dri2_glx.c
src/glx/dri3_glx.c
src/glx/drisw_glx.c