draw: don't crash if GS doesn't emit anything

[mesa.git] / src / gallium / auxiliary / vl / vl_decoder.c

diff --git a/src/gallium/auxiliary/vl/vl_decoder.c b/src/gallium/auxiliary/vl/vl_decoder.c
index fac03359a0f3292a916195046ba29ec861f9f3df..d6909cbfc0d3155bea7c7ca387634fdb22b9e833 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_decoder.c
+++ b/src/gallium/auxiliary/vl/vl_decoder.c
@@ -25,9 +25,9 @@
  *
  **************************************************************************/
 
-#include <pipe/p_video_decoder.h>
+#include "pipe/p_video_decoder.h"
 
-#include <util/u_video.h>
+#include "util/u_video.h"
 
 #include "vl_decoder.h"
 #include "vl_mpeg12_decoder.h"
@@ -49,7 +49,8 @@ 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 width, unsigned height, unsigned max_references,
+                  bool expect_chunked_decode)
 {
    unsigned buffer_width, buffer_height;
    bool pot_buffers;
@@ -64,12 +65,14 @@ vl_create_decoder(struct pipe_context *pipe,
       PIPE_VIDEO_CAP_NPOT_TEXTURES
    );
 
-   buffer_width = pot_buffers ? util_next_power_of_two(width) : align(width, MACROBLOCK_WIDTH);
-   buffer_height = pot_buffers ? util_next_power_of_two(height) : align(height, MACROBLOCK_HEIGHT);
+   buffer_width = pot_buffers ? util_next_power_of_two(width) : align(width, VL_MACROBLOCK_WIDTH);
+   buffer_height = pot_buffers ? util_next_power_of_two(height) : align(height, VL_MACROBLOCK_HEIGHT);
 
    switch (u_reduce_video_profile(profile)) {
       case PIPE_VIDEO_CODEC_MPEG12:
-         return vl_create_mpeg12_decoder(pipe, profile, entrypoint, chroma_format, buffer_width, buffer_height);
+         return vl_create_mpeg12_decoder(pipe, profile, entrypoint, chroma_format,
+                                         buffer_width, buffer_height, max_references,
+                                         expect_chunked_decode);
       default:
          return NULL;
    }