From owner-freebsd-multimedia Sun Jan 13 19:52:39 2002 Delivered-To: freebsd-multimedia@freebsd.org Received: from mail4.nc.rr.com (fe4.southeast.rr.com [24.93.67.51]) by hub.freebsd.org (Postfix) with ESMTP id 9479337B419 for ; Sun, 13 Jan 2002 19:52:34 -0800 (PST) Received: from stealth.cary.dummynet ([66.26.231.240]) by mail4.nc.rr.com with Microsoft SMTPSVC(5.5.1877.687.68); Sun, 13 Jan 2002 22:52:31 -0500 Received: (from rhh@localhost) by stealth.cary.dummynet (8.11.4/8.11.4) id g0E3qmm73302; Sun, 13 Jan 2002 22:52:48 -0500 (EST) (envelope-from aa8vb@nc.rr.com) X-Authentication-Warning: stealth.cary.dummynet: rhh set sender to aa8vb@nc.rr.com using -f Date: Sun, 13 Jan 2002 22:52:47 -0500 From: Randall Hopper To: joeo@cracktown.com Cc: multimedia@FreeBSD.ORG Subject: Re: Unreal Tournament (was Re: OpenGL) Message-ID: <20020113225247.A73051@nc.rr.com> References: <20020113140539.A65807@nc.rr.com> <20020113203911.A71394@nc.rr.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="opJtzjQTFsWo+cga" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020113203911.A71394@nc.rr.com>; from aa8vb@nc.rr.com on Sun, Jan 13, 2002 at 08:39:11PM -0500 Sender: owner-freebsd-multimedia@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Randall Hopper: | |#if defined(XFree86Server) | | fd = drmOpenMinor(i, 1); | |#else | | fd = drmOpenMinor(i, 0); | |#endif | |Thanks. It got a little further this time, but still has problems. ... |I'm doing a rebuild now to see if something wasn't propagated correctly |(though, having edited only one .c file and having seen the results of the |change in the glxinfo run, I'm not optimistic that it'll make a |difference...) Another "make World" made no difference (patch attached). Also, there is in fact a -DXFree86Server in STD_DEFINES in os-support/linux/drm/Makefile that XFree86 put there, which explains at least why drmMalloc is using xalloc instead of malloc. But why xalloc is returning NULL (and what its purpose is beyond plain malloc), I don't know. Got to hang it up for this evening. Randall -- Randall Hopper aa8vb@nc.rr.com --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch --- xc/programs/Xserver/hw/xfree86/os-support/linux/drm/ORIG/xf86drm.c Mon Aug 27 13:40:59 2001 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c Sun Jan 13 19:58:01 2002 @@ -270,7 +270,11 @@ int retval = 0; int fd; +#if defined(XFree86Server) if ((fd = drmOpenMinor(0, 1)) < 0) { +#else + if ((fd = drmOpenMinor(0, 0)) < 0) { +#endif /* Try proc for backward Linux compatibility */ if (!access("/proc/dri/0", R_OK)) return 1; return 0; @@ -293,7 +297,11 @@ drmMsg("drmOpenByBusid: busid is %s\n", busid); for (i = 0; i < DRM_MAX_MINOR; i++) { - fd = drmOpenMinor(i, 1); +#if defined(XFree86Server) + fd = drmOpenMinor(i, 1); +#else + fd = drmOpenMinor(i, 0); +#endif drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); if (fd >= 0) { buf = drmGetBusid(fd); @@ -334,7 +342,11 @@ * already in use. If it's in use it will have a busid assigned already. */ for (i = 0; i < DRM_MAX_MINOR; i++) { +#if defined(XFree86Server) if ((fd = drmOpenMinor(i, 1)) >= 0) { +#else + if ((fd = drmOpenMinor(i, 0)) >= 0) { +#endif if ((version = drmGetVersion(fd))) { if (!strcmp(version->name, name)) { drmFreeVersion(version); --opJtzjQTFsWo+cga-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-multimedia" in the body of the message