From fee912ca116cc902cfbde9d08396f5d38c09fdc6 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 5 Dec 2013 05:39:11 +0000 Subject: Mesa 10.0 release branch git snapshot --- sanitize-tarball.sh | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'sanitize-tarball.sh') diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh index 54b2d0c..ecaa861 100755 --- a/sanitize-tarball.sh +++ b/sanitize-tarball.sh @@ -20,14 +20,9 @@ pushd $dirname cat > src/gallium/auxiliary/vl/vl_mpeg12_decoder.c << EOF #include "vl_mpeg12_decoder.h" -struct pipe_video_decoder * -vl_create_mpeg12_decoder(struct pipe_context *context, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint, - enum pipe_video_chroma_format chroma_format, - unsigned width, unsigned height, - unsigned max_references, - bool expect_chunked_decode) +struct pipe_video_codec * +vl_create_mpeg12_decoder(struct pipe_context *pipe, + const struct pipe_video_codec *templat) { return NULL; } @@ -36,17 +31,14 @@ EOF cat > src/gallium/auxiliary/vl/vl_decoder.c << EOF #include "vl_decoder.h" bool vl_profile_supported(struct pipe_screen *screen, - enum pipe_video_profile profile) + enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint) { return false; } -struct pipe_video_decoder * +struct pipe_video_codec * vl_create_decoder(struct pipe_context *pipe, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint, - enum pipe_video_chroma_format chroma_format, - unsigned width, unsigned height, unsigned max_references, - bool expect_chunked_decode) + const struct pipe_video_codec *templat) { return NULL; } -- cgit From f5c756cfd11b6f27439f8f945e1e40f82276581e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 5 Dec 2013 10:24:55 +0400 Subject: Revert "Mesa 10.0 release branch git snapshot" This reverts commit fee912ca116cc902cfbde9d08396f5d38c09fdc6. Signed-off-by: Igor Gnatenko --- sanitize-tarball.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'sanitize-tarball.sh') diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh index ecaa861..54b2d0c 100755 --- a/sanitize-tarball.sh +++ b/sanitize-tarball.sh @@ -20,9 +20,14 @@ pushd $dirname cat > src/gallium/auxiliary/vl/vl_mpeg12_decoder.c << EOF #include "vl_mpeg12_decoder.h" -struct pipe_video_codec * -vl_create_mpeg12_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) +struct pipe_video_decoder * +vl_create_mpeg12_decoder(struct pipe_context *context, + enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint, + enum pipe_video_chroma_format chroma_format, + unsigned width, unsigned height, + unsigned max_references, + bool expect_chunked_decode) { return NULL; } @@ -31,14 +36,17 @@ EOF cat > src/gallium/auxiliary/vl/vl_decoder.c << EOF #include "vl_decoder.h" bool vl_profile_supported(struct pipe_screen *screen, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint) + enum pipe_video_profile profile) { return false; } -struct pipe_video_codec * +struct pipe_video_decoder * vl_create_decoder(struct pipe_context *pipe, - const struct pipe_video_codec *templat) + enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint, + enum pipe_video_chroma_format chroma_format, + unsigned width, unsigned height, unsigned max_references, + bool expect_chunked_decode) { return NULL; } -- cgit From 037ad6c04b9f2b95d2ee5bcf6b68e3fe3eacb711 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 1 Dec 2013 16:51:48 +0400 Subject: 10.0 upstream release v1: dropped libdricore.so* (dropped by upstream) updated libxatracker.so.1 to libxatracker.so.2 (updated by upstream) updated patches and tools: make-git-snapshot updated for 10.0 branch sanitize-tarball updated for new functions nv-50 build fix updated for new file location dropped no-useless-vdpau, because not needed for new mesa stack v2: Added msm_dri.so (added by upstream) v3: Fix sanitize for vl_level_supported() Reported-and-tested-by: Kirill Rusinov v4: Add reference to spec Drop old patch nv50 Tested-by: Kirill Rusinov Signed-off-by: Igor Gnatenko Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1036361 --- sanitize-tarball.sh | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'sanitize-tarball.sh') diff --git a/sanitize-tarball.sh b/sanitize-tarball.sh index 54b2d0c..414882a 100755 --- a/sanitize-tarball.sh +++ b/sanitize-tarball.sh @@ -20,14 +20,9 @@ pushd $dirname cat > src/gallium/auxiliary/vl/vl_mpeg12_decoder.c << EOF #include "vl_mpeg12_decoder.h" -struct pipe_video_decoder * +struct pipe_video_codec * vl_create_mpeg12_decoder(struct pipe_context *context, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint, - enum pipe_video_chroma_format chroma_format, - unsigned width, unsigned height, - unsigned max_references, - bool expect_chunked_decode) + const struct pipe_video_codec *templat) { return NULL; } @@ -35,20 +30,24 @@ EOF cat > src/gallium/auxiliary/vl/vl_decoder.c << EOF #include "vl_decoder.h" -bool vl_profile_supported(struct pipe_screen *screen, - enum pipe_video_profile profile) +bool +vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile, + enum pipe_video_entrypoint entrypoint) { - return false; + return false; } -struct pipe_video_decoder * + +int +vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile) +{ + return 0; +} + +struct pipe_video_codec * vl_create_decoder(struct pipe_context *pipe, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint, - enum pipe_video_chroma_format chroma_format, - unsigned width, unsigned height, unsigned max_references, - bool expect_chunked_decode) + const struct pipe_video_codec *templat) { - return NULL; + return NULL; } EOF -- cgit