From patchwork Tue May 3 17:59:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 750982 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p43I3APw009651 for ; Tue, 3 May 2011 18:03:31 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E6709EFC9 for ; Tue, 3 May 2011 11:03:10 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from oproxy2-pub.bluehost.com (oproxy2-pub.bluehost.com [67.222.39.60]) by gabe.freedesktop.org (Postfix) with SMTP id D797F9EFFF for ; Tue, 3 May 2011 10:59:31 -0700 (PDT) Received: (qmail 4895 invoked by uid 0); 3 May 2011 17:59:30 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy2.bluehost.com with SMTP; 3 May 2011 17:59:30 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=dh6V6aPpvBKxKto4yfDuxYHNmcOChAhla7W0bzJriTMxFwSn230Tahwn34bnBSvZcyMiwzo4ofUwUmwR9m1LNw40ioC6i2JFfgLWakQMVqzz/VTWIQqXjnSn3oGl+UMN; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1QHJsd-0004gv-Vk; Tue, 03 May 2011 11:59:28 -0600 From: Jesse Barnes To: dri-devel@lists.freedesktop.org, xorg-devel@lists.freedesktop.org, mesa-dev@lists.freedesktop.org Subject: [PATCH] GLX: fix broken swap event size by using a generic event Date: Tue, 3 May 2011 10:59:15 -0700 Message-Id: <1304445561-9910-3-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1304445561-9910-1-git-send-email-jbarnes@virtuousgeek.org> References: <1304445561-9910-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 03 May 2011 18:03:31 +0000 (UTC) The existing event is too large for an XEvent meaning that the swap count is never sent to clients. Create a generic event instead for use by new clients & servers. Signed-off-by: Jesse Barnes --- configure.ac | 2 +- glxproto.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index d88e6df..a3047e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/glxproto.h b/glxproto.h index 0ff44e3..d026d4d 100644 --- a/glxproto.h +++ b/glxproto.h @@ -1384,6 +1384,24 @@ typedef struct { CARD32 sbc_lo B32; } xGLXBufferSwapComplete; +/* The above is actually too large to fit in an XEvent, so use a generic + * event so we can send the sbc count as well. */ +typedef struct { + BYTE type; + CARD8 extension; + CARD16 sequenceNumber B16; + CARD32 length B32; /* should always be 8 for this event */ + CARD16 evtype B16; + CARD16 swap_event_type B16; + CARD32 drawable B32; + CARD32 ust_hi B32; + CARD32 ust_lo B32; + CARD32 msc_hi B32; + CARD32 msc_lo B32; + CARD32 sbc_hi B32; + CARD32 sbc_lo B32; +} xGLXBufferSwapComplete2; + /************************************************************************/ /*