Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

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

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c b/src/gallium/drivers/nvfx/nvfx_screen.c
index 8024800bd09dc29d8ca464856d7e323e8876aeeb..875b3a96ca693847db87a1ca8cbb51beec3256f7 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -6,6 +6,7 @@
 #include "nouveau/nouveau_screen.h"
 #include "nouveau/nv_object.xml.h"
 #include "nvfx_context.h"
+#include "nvfx_video_context.h"
 #include "nvfx_screen.h"
 #include "nvfx_resource.h"
 #include "nvfx_tex.h"
@@ -434,6 +435,7 @@ nvfx_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        pscreen->get_paramf = nvfx_screen_get_paramf;
        pscreen->is_format_supported = nvfx_screen_is_format_supported;
        pscreen->context_create = nvfx_create;
+       pscreen->video_context_create = nvfx_video_create;
 
        switch (dev->chipset & 0xf0) {
        case 0x30: