Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / state_trackers / xorg / xvmc / surface.c

diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index d7285a478fb4e473663cb0060e4b52dadf76d6b6..c90ad409c1008f40eabd14b928c08b69ac35a57c 100644 (file)
--- a/src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/src/gallium/state_trackers/xorg/xvmc/surface.c
@@ -122,6 +122,7 @@ CreateOrResizeBackBuffer(struct vl_context *vctx, unsigned int width, unsigned i
    template.width0 = width;
    template.height0 = height;
    template.depth0 = 1;
+   template.array_size = 1;
    template.usage = PIPE_USAGE_DEFAULT;
    template.bind = PIPE_BIND_RENDER_TARGET | PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_BLIT_SOURCE;
    template.flags = 0;
@@ -240,6 +241,7 @@ Status XvMCCreateSurface(Display *dpy, XvMCContext *context, XvMCSurface *surfac
       template.height0 = util_next_power_of_two(context->height);
    }
    template.depth0 = 1;
+   template.array_size = 1;
    template.usage = PIPE_USAGE_DEFAULT;
    template.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
    template.flags = 0;