From patchwork Tue May 3 21:08:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 751712 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 p43L9jRs031417 for ; Tue, 3 May 2011 21:10:05 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F7F09F0F3 for ; Tue, 3 May 2011 14:09:44 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from oproxy3-pub.bluehost.com (oproxy3-pub.bluehost.com [69.89.21.8]) by gabe.freedesktop.org (Postfix) with SMTP id 0EDA69E747 for ; Tue, 3 May 2011 14:09:05 -0700 (PDT) Received: (qmail 23767 invoked by uid 0); 3 May 2011 21:09:04 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy3.bluehost.com with SMTP; 3 May 2011 21:09:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=C6u+mM19ZjrPVRzUfGtDsfIRme4RhFZzENpBttVCORb5uB0v0GRRZ0ZsMmYK/wsFHSM/ALgjTh0bLHdgvqJl8iNFbYFkNer0Av0h7Nw6Q/uYG358nftp66RaAybT5/sh; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1QHMq8-0006cK-DJ; Tue, 03 May 2011 15:09:04 -0600 Date: Tue, 3 May 2011 14:08:58 -0700 From: Jesse Barnes Subject: Re: [PATCH] glxproto: make GLX swap event struct match spec Message-ID: <20110503140858.65d5f945@jbarnes-desktop> In-Reply-To: <20110503140231.704a1b5c@jbarnes-desktop> References: <1304450489-31415-1-git-send-email-jbarnes@virtuousgeek.org> <1304450489-31415-2-git-send-email-jbarnes@virtuousgeek.org> <20110503140231.704a1b5c@jbarnes-desktop> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Cc: xorg-devel@lists.freedesktop.org, mesa-dev@lists.freedesktop.org, dri-devel@lists.freedesktop.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: , 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 21:10:05 +0000 (UTC) On Tue, 3 May 2011 14:02:31 -0700 Jesse Barnes wrote: > On Tue, 03 May 2011 13:54:38 -0700 > Keith Packard wrote: > > > On Tue, 3 May 2011 12:21:24 -0700, Jesse Barnes wrote: > > > > > We only spec a 32 bit swap count, so drop the high sbc field. > > > > You're missing the explicit 16-bit padding field after 'event_type' > > > > The documented encoding > > http://www.opengl.org/registry/specs/INTEL/swap_event.txt needs to be > > fixed to match this, it has the padding at the end which leaves most of > > the structure mis-aligned. > > Right, another case where we updated the spec incorrectly then failed > to make the code match the broken definition (the complete enums also > need to match the final values, which are correct in the first part of > the spec). Yay for divergence. Fixed version below. Reviewed-by: Keith Packard 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..dfa0647 100644 --- a/glxproto.h +++ b/glxproto.h @@ -1375,13 +1375,13 @@ typedef struct { BYTE pad; CARD16 sequenceNumber B16; CARD16 event_type B16; + CARD16 pad2; CARD32 drawable; CARD32 ust_hi B32; CARD32 ust_lo B32; CARD32 msc_hi B32; CARD32 msc_lo B32; - CARD32 sbc_hi B32; - CARD32 sbc_lo B32; + CARD32 sbc B32; } xGLXBufferSwapComplete; /************************************************************************/