Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jul 1999 05:40:50 +0200 (CEST)
From:      Marc van Woerkom <van.woerkom@netcologne.de>
To:        freebsd-multimedia@freebsd.org
Subject:   Updating riva-glx to XFree86-3.3.4
Message-ID:  <199907260340.FAA16744@oranje.my.domain>

next in thread | raw e-mail | index | archive | help

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199907260340.FAA16744>