[Mesa-dev] [PATCH 1/4] nouveau: fix number of surfaces in video buffer, use defines

[Ilia Mirkin]

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

The pipe_surface miscount caused issues for my (failed) attempt at getting
vdpau to work with pmpeg.

 src/gallium/drivers/nouveau/nouveau_video.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_video.h b/src/gallium/drivers/nouveau/nouveau_video.h
index 1d6ced0..be53758 100644
--- a/src/gallium/drivers/nouveau/nouveau_video.h
+++ b/src/gallium/drivers/nouveau/nouveau_video.h
@@ -10,10 +10,10 @@
 struct nouveau_video_buffer {
    struct pipe_video_buffer base;
    unsigned num_planes;
-   struct pipe_resource     *resources[3];
-   struct pipe_sampler_view *sampler_view_planes[3];
-   struct pipe_sampler_view *sampler_view_components[3];
-   struct pipe_surface      *surfaces[3];
+   struct pipe_resource     *resources[VL_NUM_COMPONENTS];
+   struct pipe_sampler_view *sampler_view_planes[VL_NUM_COMPONENTS];
+   struct pipe_sampler_view *sampler_view_components[VL_NUM_COMPONENTS];
+   struct pipe_surface      *surfaces[VL_NUM_COMPONENTS * 2];
 };
 
 struct nouveau_decoder {
-- 
1.8.1.5