From owner-freebsd-multimedia Sun Jul 25 20:43:59 1999 Delivered-To: freebsd-multimedia@freebsd.org Received: from mail2.netcologne.de (mail2.netcologne.de [194.8.194.103]) by hub.freebsd.org (Postfix) with ESMTP id 38D3B14BCD for ; Sun, 25 Jul 1999 20:43:56 -0700 (PDT) (envelope-from van.woerkom@netcologne.de) Received: from oranje.my.domain (dial12-132.netcologne.de [194.8.196.132]) by mail2.netcologne.de (8.9.3/8.9.3) with ESMTP id FAA13893; Mon, 26 Jul 1999 05:42:22 +0200 (MET DST) Received: (from marc@localhost) by oranje.my.domain (8.9.3/8.9.3) id FAA16744; Mon, 26 Jul 1999 05:40:50 +0200 (CEST) (envelope-from van.woerkom@netcologne.de) Date: Mon, 26 Jul 1999 05:40:50 +0200 (CEST) Message-Id: <199907260340.FAA16744@oranje.my.domain> X-Authentication-Warning: oranje.my.domain: marc set sender to van.woerkom@netcologne.de using -f From: Marc van Woerkom To: freebsd-multimedia@freebsd.org Subject: Updating riva-glx to XFree86-3.3.4 Reply-To: van.woerkom@netcologne.de Sender: owner-freebsd-multimedia@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org I sat down tonight, diffing through XFree86 to adjust the riva-glx port to XFree86-3.3.4. My result is that XFree86-3.3.4 knows even more RIVA variants and has several improvments of the prior code. The only thing that seems to have been taken back between the XFree86-3.3.3.1 changes from nvidia and 3.3.4 is a change from "long long" to "long": ------------------------------------------------------------------------------- diff -u -r XFree86/work/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv/riva_hw.c XFree86.334/work.glx/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv/riva_hw.c --- XFree86/work/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv/riva_hw.c Mon May 24 23:28:24 1999 +++ XFree86.334/work.glx/xc/programs/Xserver/hw/xfree86/vga256/drivers/nv/riva_hw.c Mon Jul 26 04:23:04 1999 @@ -172,7 +172,7 @@ int vlwm, glwm, mlwm; int last, next, cur; int max_gfsize ; - long ns; + long long ns; vlwm = 0; glwm = 0; @@ -205,7 +205,7 @@ if (ainfo->wcglwm > glwm) ainfo->wcglwm = glwm ; if (ainfo->wcgocc > ainfo->gocc) ainfo->wcgocc = ainfo->gocc; ns = 1000000 * (ainfo->gburst_size/(state->memory_width/8))/state->mclk_khz; - gfsize = (ns * (long) ainfo->gdrain_rate)/1000000; + gfsize = (ns * (long long) ainfo->gdrain_rate)/1000000; gfsize = ainfo->wcglwm - ainfo->gburst_size + gfsize; } mfsize = 0; @@ -349,7 +349,7 @@ static char nv3_arb(nv3_fifo_info * res_info, nv3_sim_state * state, nv3_arb_info *ainfo) { int g, v, not_done; - long ens, vns, mns, gns; + long long ens, vns, mns, gns; int mmisses, gmisses, vmisses, eburst_size, mburst_size; int refresh_cycle; ------------------------------------------------------------------------------- What do you think of it? Should I put it in again? Regards, Marc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-multimedia" in the body of the message