summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/g3dvl/xlib
diff options
context:
space:
mode:
authorChristian König <[email protected]>2011-07-08 19:22:43 +0200
committerChristian König <[email protected]>2011-07-08 19:22:43 +0200
commitea78480029450c019287c2a94d7c42a6a1d12dc3 (patch)
tree84882aedbe4991a4665c80f991b3fa3116360ae4 /src/gallium/winsys/g3dvl/xlib
parent4e837f557bf5f5afb286e1f2244ed69c0092c2d6 (diff)
[g3dvl] and finally remove pipe_video_context
Diffstat (limited to 'src/gallium/winsys/g3dvl/xlib')
-rw-r--r--src/gallium/winsys/g3dvl/xlib/xsp_winsys.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
index 0487bd9c560..92f0bd6da90 100644
--- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
@@ -28,7 +28,6 @@
#include <X11/Xlibint.h>
#include <pipe/p_state.h>
-#include <pipe/p_video_context.h>
#include <util/u_memory.h>
#include <util/u_format.h>
@@ -173,30 +172,21 @@ struct vl_context*
vl_video_create(struct vl_screen *vscreen)
{
struct pipe_context *pipe;
- struct pipe_video_context *vpipe;
struct vl_context *vctx;
assert(vscreen);
- assert(vscreen->pscreen->video_context_create);
pipe = vscreen->pscreen->context_create(vscreen->pscreen, NULL);
if (!pipe)
return NULL;
- vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen, pipe);
- if (!vpipe) {
- pipe->destroy(pipe);
- return NULL;
- }
-
vctx = CALLOC_STRUCT(vl_context);
if (!vctx) {
pipe->destroy(pipe);
- vpipe->destroy(vpipe);
return NULL;
}
- vctx->vpipe = vpipe;
+ vctx->pipe = pipe;
vctx->vscreen = vscreen;
return vctx;
@@ -207,6 +197,5 @@ void vl_video_destroy(struct vl_context *vctx)
assert(vctx);
vctx->pipe->destroy(vctx->pipe);
- vctx->vpipe->destroy(vctx->vpipe);
FREE(vctx);
}