[g3dvl] and finally remove pipe_video_context

3 files changed, 4 insertions, 29 deletions

diff --git a/src/gallium/winsys/g3dvl/dri/dri_winsys.c b/src/gallium/winsys/g3dvl/dri/dri_winsys.c
index 1d066f826db..f854e924fa4 100644
--- a/src/gallium/winsys/g3dvl/dri/dri_winsys.c
+++ b/src/gallium/winsys/g3dvl/dri/dri_winsys.c
@@ -27,11 +27,13 @@
 
 #include <vl_winsys.h>
 #include <driclient.h>
-#include <pipe/p_video_context.h>
+#include <pipe/p_screen.h>
+#include <pipe/p_context.h>
 #include <pipe/p_state.h>
 #include <util/u_memory.h>
 #include <util/u_hash.h>
 #include <util/u_hash_table.h>
+#include <util/u_inlines.h>
 #include <state_tracker/drm_driver.h>
 #include <X11/Xlibint.h>
 
@@ -237,13 +239,6 @@ vl_video_create(struct vl_screen *vscreen)
    struct vl_dri_screen *vl_dri_scrn = (struct vl_dri_screen*)vscreen;
    struct vl_dri_context *vl_dri_ctx;
 
-   if (!vscreen->pscreen->video_context_create) {
-      debug_printf("[G3DVL] No video support found on %s/%s.\n",
-                   vscreen->pscreen->get_vendor(vscreen->pscreen),
-                   vscreen->pscreen->get_name(vscreen->pscreen));
-      goto no_vpipe;
-   }
-
    vl_dri_ctx = CALLOC_STRUCT(vl_dri_context);
    if (!vl_dri_ctx)
       goto no_struct;
@@ -256,11 +251,6 @@ vl_video_create(struct vl_screen *vscreen)
       goto no_pipe;
    }
 
-   vl_dri_ctx->base.vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen, vl_dri_ctx->base.pipe);
-
-   if (!vl_dri_ctx->base.vpipe)
-      goto no_pipe;
-
    vl_dri_ctx->base.vscreen = vscreen;
    vl_dri_ctx->fd = vl_dri_scrn->dri_screen->fd;
 
@@ -270,7 +260,6 @@ no_pipe:
    FREE(vl_dri_ctx);
 
 no_struct:
-no_vpipe:
    return NULL;
 }
 
@@ -281,6 +270,5 @@ void vl_video_destroy(struct vl_context *vctx)
    assert(vctx);
 
    vl_dri_ctx->base.pipe->destroy(vl_dri_ctx->base.pipe);
-   vl_dri_ctx->base.vpipe->destroy(vl_dri_ctx->base.vpipe);
    FREE(vl_dri_ctx);
 }
diff --git a/src/gallium/winsys/g3dvl/vl_winsys.h b/src/gallium/winsys/g3dvl/vl_winsys.h
index 2d80c1d9b32..384a8ba5f17 100644
--- a/src/gallium/winsys/g3dvl/vl_winsys.h
+++ b/src/gallium/winsys/g3dvl/vl_winsys.h
@@ -33,7 +33,6 @@
 #include <pipe/p_format.h>
 
 struct pipe_screen;
-struct pipe_video_context;
 struct pipe_surface;
 
 struct vl_screen
@@ -45,7 +44,6 @@ struct vl_context
 {
    struct vl_screen *vscreen;
    struct pipe_context *pipe;
-   struct pipe_video_context *vpipe;
 };
 
 struct vl_screen*
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);
 }