Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / drivers / softpipe / sp_context.c

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index eabf2dae3fc74dd9f0034bbfef63839fdfe7f782..c97b0333035c9e1899c6143bb3a62dc4dd2ded8d 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -38,6 +38,8 @@
 #include "util/u_pstipple.h"
 #include "util/u_inlines.h"
 #include "tgsi/tgsi_exec.h"
 #include "util/u_pstipple.h"
 #include "util/u_inlines.h"
 #include "tgsi/tgsi_exec.h"

+#include "vl/vl_decoder.h"
+#include "vl/vl_video_buffer.h"

 #include "sp_clear.h"
 #include "sp_context.h"
 #include "sp_flush.h"
 #include "sp_clear.h"
 #include "sp_context.h"
 #include "sp_flush.h"


@@ -267,6 +269,9 @@ softpipe_create_context( struct pipe_screen *screen,
    softpipe->pipe.flush = softpipe_flush_wrapped;
 
    softpipe->pipe.render_condition = softpipe_render_condition;
    softpipe->pipe.flush = softpipe_flush_wrapped;
 
    softpipe->pipe.render_condition = softpipe_render_condition;

+   
+   softpipe->pipe.create_video_decoder = vl_create_decoder;
+   softpipe->pipe.create_video_buffer = vl_video_buffer_create;

 
    /*
     * Alloc caches for accessing drawing surfaces and textures.
 
    /*
     * Alloc caches for accessing drawing surfaces and textures.