From patchwork Mon Jan 31 05:22:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Brulebois X-Patchwork-Id: 518531 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0V5Npkj018643 for ; Mon, 31 Jan 2011 05:24:11 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F0969E9B2 for ; Sun, 30 Jan 2011 21:23:51 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from glenfiddich.ikibiki.org (glenfiddich.ikibiki.org [88.191.124.82]) by gabe.freedesktop.org (Postfix) with ESMTP id 193249E7A9 for ; Sun, 30 Jan 2011 21:22:46 -0800 (PST) Received: from home.ikibiki.org ([88.164.242.219] helo=kitty) by glenfiddich.ikibiki.org with esmtp (Exim 4.69) (envelope-from ) id 1PjmDs-0007h5-BS; Mon, 31 Jan 2011 06:22:44 +0100 Received: from kibi by kitty with local (Exim 4.72) (envelope-from ) id 1PjmDs-0007PK-1w; Mon, 31 Jan 2011 06:22:44 +0100 From: Cyril Brulebois To: intel-gfx@lists.freedesktop.org Date: Mon, 31 Jan 2011 06:22:35 +0100 Message-Id: <1296451359-28449-1-git-send-email-kibi@debian.org> X-Mailer: git-send-email 1.7.2.3 Subject: [Intel-gfx] [PATCH 1/5] xvmc: Get rid of unused variables. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 31 Jan 2011 05:24:12 +0000 (UTC) diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c index 21a1149..fbd4555 100644 --- a/src/xvmc/i915_xvmc.c +++ b/src/xvmc/i915_xvmc.c @@ -391,7 +391,6 @@ static void i915_mc_static_indirect_state_set(XvMCContext * context, i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; struct intel_xvmc_surface *intel_surf = dest->privData; struct i915_mc_static_indirect_state_buffer *buffer_info; - unsigned int w = dest->width; drm_intel_gem_bo_map_gtt(pI915XvMC->sis_bo); buffer_info = pI915XvMC->sis_bo->virtual; @@ -688,7 +687,7 @@ static void i915_mc_load_indirect_render_emit(XvMCContext * context) { i915XvMCContext *pI915XvMC = (i915XvMCContext *) context->privData; int mem_select; - uint32_t load_indirect, buffer_address; + uint32_t load_indirect; BATCH_LOCALS; BEGIN_BATCH(5); diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c index 337b2ce..2b5526c 100644 --- a/src/xvmc/intel_batchbuffer.c +++ b/src/xvmc/intel_batchbuffer.c @@ -64,8 +64,6 @@ static void i965_end_batch(void) Bool intelInitBatchBuffer(void) { - int i; - if ((xvmc_driver->batch.buf = drm_intel_bo_alloc(xvmc_driver->bufmgr, "batch buffer", BATCH_SIZE, 0x1000)) == NULL) { diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c index 6cbec80..339c133 100644 --- a/src/xvmc/intel_xvmc.c +++ b/src/xvmc/intel_xvmc.c @@ -105,8 +105,6 @@ unsigned int mb_bytes_420[] = { void LOCK_HARDWARE(drm_context_t ctx) { - char __ret = 0; - PPTHREAD_MUTEX_LOCK(); assert(!xvmc_driver->locked); @@ -218,11 +216,6 @@ _X_EXPORT Status XvMCCreateContext(Display * display, XvPortID port, int error_base; int event_base; int priv_count; - int isCapable; - int screen = DefaultScreen(display); - intel_xvmc_context_ptr intel_ctx; - int fd; - char *driverName = NULL, *deviceName = NULL; /* Verify Obvious things first */ if (!display || !context) @@ -482,7 +475,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, unsigned int num_blocks, XvMCBlockArray * block) { - Status ret; if (!display || !context || !num_blocks || !block) return BadValue; @@ -505,7 +497,6 @@ _X_EXPORT Status XvMCCreateBlocks(Display * display, XvMCContext * context, */ _X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block) { - Status ret; if (!display || !block) return BadValue; @@ -679,7 +670,6 @@ _X_EXPORT Status XvMCPutSurface(Display * display, XvMCSurface * surface, _X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface) { Status ret; - int stat = 0; if (!display || !surface) return XvMCBadSurface; @@ -739,9 +729,6 @@ _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface, */ _X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface) { - int stat = 0; - Status ret; - if (!display || !surface) return XvMCBadSurface; diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c index addc7c9..d72e105 100644 --- a/src/xvmc/xvmc_vld.c +++ b/src/xvmc/xvmc_vld.c @@ -785,7 +785,6 @@ static Status begin_surface(Display * display, XvMCContext * context, XvMCSurface * future, const XvMCMpegControl * control) { - struct i965_xvmc_contex *i965_ctx; struct intel_xvmc_surface *priv_target, *priv_past, *priv_future; intel_xvmc_context_ptr intel_ctx = context->privData; Status ret;