From patchwork Wed Apr 9 22:24:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 3957821 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 03E22BFF02 for ; Wed, 9 Apr 2014 22:24:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C4882063F for ; Wed, 9 Apr 2014 22:24:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3C26020639 for ; Wed, 9 Apr 2014 22:24:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61D156EBE1; Wed, 9 Apr 2014 15:24:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 171316E154; Wed, 9 Apr 2014 15:24:24 -0700 (PDT) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 0180418126; Wed, 9 Apr 2014 15:24:24 -0700 (PDT) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 14A64F028DA; Wed, 9 Apr 2014 15:24:23 -0700 (PDT) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Apr 2014 15:24:22 -0700 Message-Id: <1397082263-21043-2-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397082263-21043-1-git-send-email-eric@anholt.net> References: <1397082263-21043-1-git-send-email-eric@anholt.net> Subject: [Intel-gfx] [PATCH 2/3] Use fbpict.h instead of defining its prototypes ourselves. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fbpict.h has been an installed header since 2008, shortly after uxa landed. This fixes compiler warnings when other headers happen to include fbpict.h. --- src/uxa/uxa-priv.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h index 3f639e7..5bf4814 100644 --- a/src/uxa/uxa-priv.h +++ b/src/uxa/uxa-priv.h @@ -53,7 +53,7 @@ #include "fb.h" #include "fboverlay.h" #ifdef RENDER -//#include "fbpict.h" +#include "fbpict.h" #include "glyphstr.h" #endif #include "damage.h" @@ -300,21 +300,6 @@ extern const GCOps uxa_ops; #ifdef RENDER -/* XXX these are in fbpict.h, which is not installed */ -void -fbComposite(CARD8 op, - PicturePtr pSrc, - PicturePtr pMask, - PicturePtr pDst, - INT16 xSrc, - INT16 ySrc, - INT16 xMask, - INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height); - -void -fbAddTraps(PicturePtr pPicture, - INT16 xOff, INT16 yOff, int ntrap, xTrap * traps); - void uxa_check_composite(CARD8 op, PicturePtr pSrc,