summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYounes Manton <[email protected]>2010-05-24 00:14:45 -0400
committerYounes Manton <[email protected]>2010-05-24 00:14:45 -0400
commit0a51e8633287b97b4d88e0cb553854535f2fa5e7 (patch)
treea0fe99ec1aa1d969d583011b2b844060fde08b2f /src
parent0e59cd33e6a38567801c7da541e4caffbd6cccd3 (diff)
vl: Use pipe_screen::video_context_create hook instead of SP ctor.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/softpipe/sp_screen.c2
-rw-r--r--src/gallium/winsys/g3dvl/xlib/xsp_winsys.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 11aa0c4583b..00700974c78 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -37,6 +37,7 @@
#include "sp_texture.h"
#include "sp_screen.h"
#include "sp_context.h"
+#include "sp_video_context.h"
#include "sp_fence.h"
#include "sp_public.h"
@@ -274,6 +275,7 @@ softpipe_create_screen(struct sw_winsys *winsys)
screen->base.is_format_supported = softpipe_is_format_supported;
screen->base.context_create = softpipe_create_context;
screen->base.flush_frontbuffer = softpipe_flush_frontbuffer;
+ screen->base.video_context_create = sp_video_create;
util_format_s3tc_init();
diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
index e5d4664d4e8..95c2af1e73c 100644
--- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
@@ -116,8 +116,12 @@ vl_video_create(struct vl_screen *vscreen,
assert(vscreen);
assert(width && height);
+ assert(vscreen->pscreen->video_context_create);
- vpipe = sp_video_create(vscreen->pscreen, profile, chroma_format, width, height);
+ vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen,
+ profile,
+ chroma_format,
+ width, height, NULL);
if (!vpipe)
return NULL;