nouveau: Add support for XvMC acceleration

[mesa.git] / src / gallium / drivers / nvfx / nvfx_buffer.c

diff --git a/src/gallium/drivers/nvfx/nvfx_buffer.c b/src/gallium/drivers/nvfx/nvfx_buffer.c
index 041099e0e568ca953464fc4aa09468077f8409be..76b7f4507c45f15485ccb79ff04d9134366809c6 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_buffer.c
+++ b/src/gallium/drivers/nvfx/nvfx_buffer.c
@@ -31,7 +31,7 @@ nvfx_buffer_create(struct pipe_screen *pscreen,
                return NULL;
 
        buffer->base.base = *template;
-       buffer->base.base.flags |= NVFX_RESOURCE_FLAG_LINEAR;
+       buffer->base.base.flags |= NOUVEAU_RESOURCE_FLAG_LINEAR;
        pipe_reference_init(&buffer->base.base.reference, 1);
        buffer->base.base.screen = pscreen;
        buffer->size = util_format_get_stride(template->format, template->width0);
@@ -56,7 +56,8 @@ nvfx_user_buffer_create(struct pipe_screen *pscreen,
                return NULL;
 
        pipe_reference_init(&buffer->base.base.reference, 1);
-       buffer->base.base.flags = NVFX_RESOURCE_FLAG_LINEAR | NVFX_RESOURCE_FLAG_USER;
+       buffer->base.base.flags =
+               NOUVEAU_RESOURCE_FLAG_LINEAR | NVFX_RESOURCE_FLAG_USER;
        buffer->base.base.screen = pscreen;
        buffer->base.base.format = PIPE_FORMAT_R8_UNORM;
        buffer->base.base.usage = PIPE_USAGE_IMMUTABLE;
@@ -64,6 +65,7 @@ nvfx_user_buffer_create(struct pipe_screen *pscreen,
        buffer->base.base.width0 = bytes;
        buffer->base.base.height0 = 1;
        buffer->base.base.depth0 = 1;
+       buffer->base.base.array_size = 1;
        buffer->data = ptr;
        buffer->size = bytes;
        buffer->bytes_to_draw_until_static = bytes * screen->static_reuse_threshold;