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

[mesa.git] / src / gallium / drivers / r600 / r600_pipe.c

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index d0d380392a07acf8bb7a1256ebb570de9e72fbe3..89b46f5ad7e78f85c4cc84239811173a4d91bf3d 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -46,6 +46,7 @@
 #include "r600_shader.h"
 #include "r600_pipe.h"
 #include "r600_state_inlines.h"
+#include "r600_video_context.h"
 
 /*
  * pipe_context
@@ -662,6 +663,7 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon)
        rscreen->screen.get_paramf = r600_get_paramf;
        rscreen->screen.is_format_supported = r600_is_format_supported;
        rscreen->screen.context_create = r600_create_context;
+       rscreen->screen.video_context_create = r600_video_create;
        rscreen->screen.fence_reference = r600_fence_reference;
        rscreen->screen.fence_signalled = r600_fence_signalled;
        rscreen->screen.fence_finish = r600_fence_finish;