From: Christian König <deathsimple@vodafone.de>
Date: Fri, 8 Jul 2011 13:07:39 +0000 (+0200)
Subject: [g3dvl] remove the unused priv member from pipe_video_context
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3bb33c911b895819fde5e179b2466c08f88164cf;p=mesa.git

[g3dvl] remove the unused priv member from pipe_video_context
---

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 854fc39e014..141df11ef91 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -426,7 +426,7 @@ static boolean r300_is_format_supported(struct pipe_screen* screen,
 }
 
 static struct pipe_video_context *
-r300_video_create(struct pipe_screen *screen, struct pipe_context *pipe, void *priv)
+r300_video_create(struct pipe_screen *screen, struct pipe_context *pipe)
 {
    assert(screen);
 
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 9e0b0ea3e49..b3264c5a670 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -302,7 +302,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 }
 
 static struct pipe_video_context *
-r600_video_create(struct pipe_screen *screen, struct pipe_context *pipe, void *priv)
+r600_video_create(struct pipe_screen *screen, struct pipe_context *pipe)
 {
 	assert(screen && pipe);
 
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 2a5485209d1..98147cfd3c8 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -301,7 +301,7 @@ softpipe_flush_frontbuffer(struct pipe_screen *_screen,
 }
 
 static struct pipe_video_context *
-sp_video_create(struct pipe_screen *screen, struct pipe_context *context, void *priv)
+sp_video_create(struct pipe_screen *screen, struct pipe_context *context)
 {
    assert(screen);
 
diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 32869bb71e8..28209346c78 100644
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -101,8 +101,7 @@ struct pipe_screen {
    struct pipe_context * (*context_create)( struct pipe_screen *, void *priv );
 
    struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen,
-                                                        struct pipe_context *context,
-                                                        void *priv );
+                                                        struct pipe_context *context );
 
    /**
     * Check if the given pipe_format is supported as a texture or
diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h
index 7ea67d3d198..aa42e8e0884 100644
--- a/src/gallium/include/pipe/p_video_context.h
+++ b/src/gallium/include/pipe/p_video_context.h
@@ -47,8 +47,6 @@ struct pipe_video_context
 {
    struct pipe_screen *screen;
 
-   void *priv; /**< context private data (for DRI for example) */
-
    /**
     * destroy context, all objects created from this context
     * (buffers, decoders, compositors etc...) must be freed before calling this
diff --git a/src/gallium/winsys/g3dvl/dri/dri_winsys.c b/src/gallium/winsys/g3dvl/dri/dri_winsys.c
index 29b7d3ea468..1d066f826db 100644
--- a/src/gallium/winsys/g3dvl/dri/dri_winsys.c
+++ b/src/gallium/winsys/g3dvl/dri/dri_winsys.c
@@ -256,14 +256,11 @@ 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,
-                                                                   vl_dri_ctx);
+   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.vpipe->priv = vl_dri_ctx;
    vl_dri_ctx->base.vscreen = vscreen;
    vl_dri_ctx->fd = vl_dri_scrn->dri_screen->fd;
 
diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
index 5cea6196cf7..0487bd9c560 100644
--- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
@@ -183,7 +183,7 @@ vl_video_create(struct vl_screen *vscreen)
    if (!pipe)
       return NULL;
 
-   vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen, pipe, NULL);
+   vpipe = vscreen->pscreen->video_context_create(vscreen->pscreen, pipe);
    if (!vpipe) {
       pipe->destroy(pipe);
       return NULL;
@@ -196,7 +196,6 @@ vl_video_create(struct vl_screen *vscreen)
       return NULL;
    }
 
-   vpipe->priv = vctx;
    vctx->vpipe = vpipe;
    vctx->vscreen = vscreen;