Merge mesa 10.0.3 into f20

commit '2f9ccd59140af45592bace9f563a2ff2e375668a'

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

Conflicts:
	.gitignore
	0001-swrast-gallium-classic-add-MESA_copy_sub_buffer-supp.patch
	mesa.spec
	sources

1 files changed, 16 insertions, 17 deletions

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