Merge pull request #2655 from lrusak/mesa-update

mesa: update to 18.0.1
This commit is contained in:
MilhouseVH 2018-04-19 10:53:57 +01:00 committed by GitHub
commit 5f91005de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 41 deletions

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="mesa"
PKG_VERSION="18.0.0"
PKG_SHA256="694e5c3d37717d23258c1f88bc134223c5d1aac70518d2f9134d6df3ee791eea"
PKG_VERSION="18.0.1"
PKG_SHA256="b2d2f5b5dbaab13e15cb0dcb5ec81887467f55ebc9625945b303a3647cd87954"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.mesa3d.org/"

View File

@ -1,39 +0,0 @@
src/gallium/state_trackers/va/context.c | 8 +++++++-
src/gallium/state_trackers/va/surface.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c
index 78e1f19ab7..c4abe77cf7 100644
--- a/src/gallium/state_trackers/va/context.c
+++ b/src/gallium/state_trackers/va/context.c
@@ -89,7 +89,13 @@ static struct VADriverVTable vtable =
&vlVaQuerySurfaceAttributes,
&vlVaAcquireBufferHandle,
&vlVaReleaseBufferHandle,
-#if 0
+#if VA_CHECK_VERSION(1, 1, 0)
+ NULL, /* vaCreateMFContext */
+ NULL, /* vaMFAddContext */
+ NULL, /* vaMFReleaseContext */
+ NULL, /* vaMFSubmit */
+ NULL, /* vaCreateBuffer2 */
+ NULL, /* vaQueryProcessingRate */
&vlVaExportSurfaceHandle,
#endif
};
diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c
index 636505b720..f9412ce52e 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -923,7 +923,7 @@ vlVaQueryVideoProcPipelineCaps(VADriverContextP ctx, VAContextID context,
return VA_STATUS_SUCCESS;
}
-#if 0
+#if VA_CHECK_VERSION(1, 1, 0)
VAStatus
vlVaExportSurfaceHandle(VADriverContextP ctx,
VASurfaceID surface_id,
--
2.11.0