misc.h
dixstruct.h
pixmapstr.h
gcstruct.h
extnsionst= .h
resource.h
scrnintstr.h
xf86Version.h
extutil.h

included in = /usr/src/OpenGL/glx/server/glxserver.h=20 are missing from
XFree86-devel-3.3.5-3.i386.rpm and also from the = latest=20 version.
where are they?

Sincerely

David

------=_NextPart_000_0005_01C074E7.64F4B500-- From owner-ogl-sample@oss.sgi.com Tue Jan 2 13:31:27 2001 Received: by oss.sgi.com id ; Tue, 2 Jan 2001 13:31:17 -0800 Received: from deliverator.sgi.com ([204.94.214.10]:55630 "EHLO deliverator.sgi.com") by oss.sgi.com with ESMTP id ; Tue, 2 Jan 2001 13:30:51 -0800 Received: from arioch.engr.sgi.com (arioch.engr.sgi.com [130.62.54.161]) by deliverator.sgi.com (980309.SGI.8.8.8-aspam-6.2/980310.SGI-aspam) via ESMTP id NAA29541 for ; Tue, 2 Jan 2001 13:30:00 -0800 (PST) mail_from (shreiner@arioch.engr.sgi.com) Received: (from shreiner@localhost) by arioch.engr.sgi.com (SGI-8.9.3/8.9.3) id NAA49142; Tue, 2 Jan 2001 13:29:35 -0800 (PST) From: Dave Shreiner MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Tue, 2 Jan 2001 13:29:35 -0800 (PST) To: ogl-sample@oss.sgi.com Subject: Re: [ogl-sample] missing headers In-Reply-To: <000801c074df$23355280$5a8b2fc3@pc1> References: <000801c074df$23355280$5a8b2fc3@pc1> X-Mailer: VM 6.43 under 20.4 "Emerald" XEmacs Lucid Message-ID: <14930.18279.32418.789457@arioch.engr.sgi.com> Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing Hi David, > the X-headers: > > misc.h > dixstruct.h > pixmapstr.h > gcstruct.h > extnsionst.h > resource.h > scrnintstr.h > xf86Version.h > extutil.h > > included in /usr/src/OpenGL/glx/server/glxserver.h are missing from > XFree86-devel-3.3.5-3.i386.rpm and also from the latest version. > where are they? They are distributed with the XFree86 Source code release that you get from XFree86. I don't believe (but I'm not sure) that the source code for the X server (XFree86) is distributed in an RPM format. In order to build the OpenGL Sample Implementation, you will need to be able to build an XFree86 X server, which the OpenGL SI will be linked into. You can grab those bits from http://www.xfree86.org. Building an X server isn't terribly complicated; the magic is in one file named "host.def", that is discussed somewhat in the OpenGL SI's README.1st file that's located in the "main" directory of the SI's CVS tree. Hope that helps. Please ping the list again if you need additional assistance. Good luck. -- Thanx, Dave --------------------------------------------------------------------- Dave Shreiner Silicon Graphics, Inc. (650) 933-4899 From owner-ogl-sample@oss.sgi.com Tue Jan 2 17:12:08 2001 Received: by oss.sgi.com id ; Tue, 2 Jan 2001 17:11:58 -0800 Received: from pneumatic-tube.sgi.com ([204.94.214.22]:29806 "EHLO pneumatic-tube.sgi.com") by oss.sgi.com with ESMTP id ; Tue, 2 Jan 2001 17:11:43 -0800 Received: from oddhack.engr.sgi.com (oddhack.engr.sgi.com [130.62.54.158]) by pneumatic-tube.sgi.com (980327.SGI.8.8.8-aspam/980310.SGI-aspam) via ESMTP id RAA05817 for ; Tue, 2 Jan 2001 17:20:20 -0800 (PST) mail_from (ljp@oddhack.engr.sgi.com) Received: (from ljp@localhost) by oddhack.engr.sgi.com (SGI-8.9.3/8.9.3) id RAA16373; Tue, 2 Jan 2001 17:10:27 -0800 (PST) Message-ID: <20010102171026.D16245@oddhack.engr.sgi.com> Date: Tue, 2 Jan 2001 17:10:26 -0800 From: Jon Leech To: ogl-sample@oss.sgi.com Subject: Re: [ogl-sample] Windows version? References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.91.1 In-Reply-To: ; from Drcadmando@aol.com on Fri, Dec 08, 2000 at 12:30:18PM -0500 Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing On Fri, Dec 08, 2000 at 12:30:18PM -0500, Drcadmando@aol.com wrote: > I downloaded the sample files- thanx much. I see they packaged in a.tgz, and > I saw a lot of commentary re LINUX, which I have and will use these files in. > However, my primary interest at the moment is a Windows 98 implementation, > and of course I could just convert the unix format to dos format. But I > wonder, is there any specifically Windows activity for these source files? I > have the Windows .dll files, so somewhere there must be a project of some > sort with its own makefile, or ide, or dsw, or something. > > Marvin E Walden Hi Marvin, Sorry to be so slow getting back to you. opengl32.dll on Windows is not quite the same code as the OpenGL SI. While it does include a generic software renderer based on an older version of the SI renderer, opengl32.dll primarily serves as a loader and dispatch mechanism for vendor OpenGL ICDs (hardware drivers). It also uses Microsoft's WGL interface, rather than GLX, to create and manage OpenGL renderables under Windows. Parts of the WGL and ICD code are owned by Microsoft and licensed by them to vendors writing drivers; we can't open source code that we don't own. A while back, someone did port the SI under Cygwin to run with XFree86 as a Windows application - there's a link to this work in the news section of the ogl-sample website. That's not what you're asking for, but it's the closest thing we have. Jon Leech SGI From owner-ogl-sample@oss.sgi.com Sat Jan 27 01:15:30 2001 Received: by oss.sgi.com id ; Sat, 27 Jan 2001 01:15:21 -0800 Received: from f302.pav1.hotmail.com ([64.4.30.177]:56837 "EHLO hotmail.com") by oss.sgi.com with ESMTP id ; Sat, 27 Jan 2001 01:15:07 -0800 Received: from mail pickup service by hotmail.com with Microsoft SMTPSVC; Sat, 27 Jan 2001 01:14:53 -0800 Received: from 137.189.91.198 by pv1fd.pav1.hotmail.msn.com with HTTP; Sat, 27 Jan 2001 09:14:52 GMT X-Originating-IP: [137.189.91.198] From: "Crystal Yip" To: ogl-sample@oss.sgi.com Subject: [ogl-sample] Source Tree Location Date: Sat, 27 Jan 2001 17:14:52 +0800 Mime-Version: 1.0 Content-Type: text/plain; format=flowed Message-ID: X-OriginalArrivalTime: 27 Jan 2001 09:14:53.0034 (UTC) FILETIME=[9B8D14A0:01C08841] Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing Dear Sir/Madam, I am a University student looking for the source code of the "OpenGL on Silicon Graphics Systems". For instance, the example 7-3, the sharpen.c, as it has stated the complete example is included in the source tree as sharpen.c. I would like to the know the URL location of the .c files. Thanks a lot. Best regards, Crystal _________________________________________________________________________ Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com. From owner-ogl-sample@oss.sgi.com Sat Jan 27 18:31:14 2001 Received: by oss.sgi.com id ; Sat, 27 Jan 2001 18:31:05 -0800 Received: from sgi.SGI.COM ([192.48.153.1]:37494 "EHLO sgi.com") by oss.sgi.com with ESMTP id ; Sat, 27 Jan 2001 18:30:55 -0800 Received: from arioch.engr.sgi.com ([130.62.54.161]) by sgi.com (980327.SGI.8.8.8-aspam/980304.SGI-aspam: SGI does not authorize the use of its proprietary systems or networks for unsolicited or bulk email from the Internet.) via ESMTP id SAA08143 for ; Sat, 27 Jan 2001 18:30:44 -0800 (PST) mail_from (shreiner@arioch.engr.sgi.com) Received: (from shreiner@localhost) by arioch.engr.sgi.com (SGI-8.9.3/8.9.3) id SAA22715 for ogl-sample@oss.sgi.com; Sat, 27 Jan 2001 18:30:20 -0800 (PST) Date: Sat, 27 Jan 2001 18:30:20 -0800 (PST) From: Dave Shreiner Message-Id: <200101280230.SAA22715@arioch.engr.sgi.com> To: ogl-sample@oss.sgi.com Subject: Re: [ogl-sample] Source Tree Location Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing Hi Crystal, That bit of code ships on SGI systems in the sample source code directory: /usr/share/src/OpenGL. However, just to simplify things, here's the entire program. /* * sharpen - simple program for texture sharpening * * Press l key for bilinear magnification * a key to sharpen alpha * c key to sharpen color * s key to sharpen alpha and color */ /* compile: cc -o sharpen sharpen.c -lGLU -lGL -lX11 */ #include #include #include #include #include /* tree texture: high alpha in foreground, zero alpha in background */ #define B 0x00000000 #define F 0xA0A0A0ff unsigned int tex[] = { B,B,B,B,B,B,B,B,B,B,B,B,B,B,B,B, B,B,B,B,B,B,B,F,F,B,B,B,B,B,B,B, B,B,B,B,B,B,B,F,F,B,B,B,B,B,B,B, B,B,B,B,B,B,F,F,F,F,B,B,B,B,B,B, B,B,B,B,B,B,F,F,F,F,B,B,B,B,B,B, B,B,B,B,B,F,F,F,F,F,F,B,B,B,B,B, B,B,B,B,B,F,F,F,F,F,F,B,B,B,B,B, B,B,B,B,F,F,F,F,F,F,F,F,B,B,B,B, B,B,B,B,F,F,F,F,F,F,F,F,B,B,B,B, B,B,B,F,F,F,F,F,F,F,F,F,F,B,B,B, B,B,B,F,F,F,F,F,F,F,F,F,F,B,B,B, B,B,F,F,F,F,F,F,F,F,F,F,F,F,B,B, B,B,F,F,F,F,F,F,F,F,F,F,F,F,B,B, B,B,B,B,B,B,F,F,F,F,B,B,B,B,B,B, B,B,B,B,B,B,F,F,F,F,B,B,B,B,B,B, B,B,B,B,B,B,B,B,B,B,B,B,B,B,B,B, }; static void init(void) { glEnable(GL_TEXTURE_2D); glMatrixMode(GL_PROJECTION); gluPerspective(60.0, 1.0, 1.0, 10.0 ); glMatrixMode(GL_MODELVIEW); glTranslatef(0.,0.,-2.5); glColor4f(0,0,0,1); glClearColor(0.0, 0.0, 0.0, 1.0); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); /* sharpening just alpha is useful for keeping the tree outline crisp */ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_SHARPEN_ALPHA_SGIS); /* generate mipmaps; levels 0 and 1 are needed for sharpening */ gluBuild2DMipmaps(GL_TEXTURE_2D, 4, 16, 16, GL_RGBA, GL_UNSIGNED_BYTE, tex); } static void draw_scene(void) { glClear(GL_COLOR_BUFFER_BIT); glBegin(GL_TRIANGLE_STRIP); glTexCoord2f( 0, 1); glVertex2f(-1,-1); glTexCoord2f( 0, 0); glVertex2f(-1, 1); glTexCoord2f( 1, 1); glVertex2f( 1,-1); glTexCoord2f( 1, 0); glVertex2f( 1, 1); glEnd(); glFlush(); } static void process_input(Display *dpy) { XEvent event; Bool redraw = 0; do { char buf[31]; KeySym keysym; XNextEvent(dpy, &event); switch(event.type) { case Expose: redraw = 1; break; case ConfigureNotify: glViewport(0, 0, event.xconfigure.width, event.xconfigure.height); redraw = 1; break; case KeyPress: (void) XLookupString(&event.xkey, buf, sizeof(buf), &keysym, NULL); redraw = 1; switch (keysym) { case XK_s: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_SHARPEN_SGIS); break; case XK_a: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_SHARPEN_ALPHA_SGIS); break; case XK_c: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_SHARPEN_COLOR_SGIS); break; case XK_l: glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); break; case XK_Escape: exit(EXIT_SUCCESS); default: break; } default: break; } } while (XPending(dpy)); if (redraw) draw_scene(); } static void error(const char *prog, const char *msg) { fprintf(stderr, "%s: %s\n", prog, msg); exit(EXIT_FAILURE); } static int attributeList[] = { GLX_RGBA, None }; int main(int argc, char **argv) { Display *dpy; XVisualInfo *vi; XSetWindowAttributes swa; Window win; GLXContext cx; dpy = XOpenDisplay(0); if (!dpy) error(argv[0], "can't open display"); vi = glXChooseVisual(dpy, DefaultScreen(dpy), attributeList); if (!vi) error(argv[0], "no suitable visual"); cx = glXCreateContext(dpy, vi, 0, GL_TRUE); swa.colormap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone); swa.border_pixel = 0; swa.event_mask = ExposureMask | StructureNotifyMask | KeyPressMask; win = XCreateWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, 800, 800, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel|CWColormap|CWEventMask, &swa); XStoreName(dpy, win, "sharpen"); XMapWindow(dpy, win); glXMakeCurrent(dpy, win, cx); init(); while (1) process_input(dpy); } Hope that helps. Thanx, Dave --------------------------------------------------------------------- Dave Shreiner Silicon Graphics, Inc. (650) 933-4899 From owner-ogl-sample@oss.sgi.com Mon Jan 29 17:43:41 2001 Received: by oss.sgi.com id ; Mon, 29 Jan 2001 17:43:22 -0800 Received: from nvgate.nvidia.com ([140.174.105.2]:605 "EHLO thelma.NVidia.COM") by oss.sgi.com with ESMTP id ; Mon, 29 Jan 2001 17:43:12 -0800 Received: from exchange.nvidia.com (exchange [172.16.30.109]) by thelma.NVidia.COM (8.8.8+Sun/8.8.8) with SMTP id RAA15331 for ; Mon, 29 Jan 2001 17:43:07 -0800 (PST) Received: from 127.0.0.1 by exchange.nvidia.com (InterScan E-Mail VirusWall NT); Mon, 29 Jan 2001 17:43:07 -0800 (Pacific Standard Time) Received: by exchange.nvidia.com with Internet Mail Service (5.5.2653.19) id ; Mon, 29 Jan 2001 17:43:07 -0800 Received: from exchange.nvidia.com (localhost [127.0.0.1]) by exchange.nvidia.com with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2653.13) id DZ2JBNA3; Mon, 29 Jan 2001 17:43:03 -0800 Received: from 172.16.23.233 by exchange.nvidia.com (InterScan E-Mail VirusWall NT); Mon, 29 Jan 2001 17:43:03 -0800 (Pacific Standard Time) From: Andrew Ritger To: ogl-sample@oss.sgi.com Date: Mon, 29 Jan 2001 17:44:04 -0800 (PST) Subject: [ogl-sample] GLU's mipmap.c Message-ID: MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="279767319-1244091998-980818888=:21898" Content-ID: Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --279767319-1244091998-980818888=:21898 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII Content-ID: Greetings, I've attached a patch to the file main/gfx/lib/glu/libutil/mipmap.c that addresses two issues: - relaxes argument checking for the gluBuildMipmaps routines internalFormat argument; validating the internalFormat broke some extensions. I suppose that you could add cases to the switch statement in isLegalInternalFormat(), but this check will just break some other future extension, and the error checking doesn't by anything because glTexImage* will just do the same check itself. - modified closestFit() to handle the GL_ARB_texture_cube_map extension. Thank you, - Andy Ritger --279767319-1244091998-980818888=:21898 Content-Type: TEXT/PLAIN; CHARSET=US-ASCII; NAME="mipmap.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: mipmap.patch Content-Disposition: ATTACHMENT; FILENAME="mipmap.patch" KioqIG1pcG1hcC5jCU1vbiBKYW4gMjkgMTc6MTI6MjMgMjAwMQ0KLS0tIG1pcG1hcC5jLm5ldwlN b24gSmFuIDI5IDE3OjExOjM3IDIwMDENCioqKioqKioqKioqKioqKg0KKioqIDE1NSwxNjEgKioq Kg0KICANCiAgc3RhdGljIGludCBjaGVja01pcG1hcEFyZ3MoR0xlbnVtLCBHTGVudW0sIEdMZW51 bSk7DQogIHN0YXRpYyBHTGJvb2xlYW4gbGVnYWxGb3JtYXQoR0xlbnVtKTsNCi0gc3RhdGljIEdM Ym9vbGVhbiBpc0xlZ2FsSW50ZXJuYWxGb3JtYXQoR0xlbnVtKTsNCiAgc3RhdGljIEdMYm9vbGVh biBsZWdhbFR5cGUoR0xlbnVtKTsNCiAgc3RhdGljIEdMYm9vbGVhbiBpc1R5cGVQYWNrZWRQaXhl bChHTGVudW0pOw0KICBzdGF0aWMgR0xib29sZWFuIGlzTGVnYWxGb3JtYXRGb3JQYWNrZWRQaXhl bFR5cGUoR0xlbnVtLCBHTGVudW0pOw0KLS0tIDE1NSwxNjAgLS0tLQ0KKioqKioqKioqKioqKioq DQoqKiogMzIzMSwzMjM5ICoqKioNCiAgDQogIHN0YXRpYyBpbnQgY2hlY2tNaXBtYXBBcmdzKEdM ZW51bSBpbnRlcm5hbEZvcm1hdCwgR0xlbnVtIGZvcm1hdCwgR0xlbnVtIHR5cGUpDQogIHsNCi0g ICAgIGlmICghaXNMZWdhbEludGVybmFsRm9ybWF0KGludGVybmFsRm9ybWF0KSkgew0KLSAgICAg ICAgcmV0dXJuIEdMVV9JTlZBTElEX0VOVU07ICAgDQotICAgICB9DQogICAgICBpZiAoIWxlZ2Fs Rm9ybWF0KGZvcm1hdCkgfHwgIWxlZ2FsVHlwZSh0eXBlKSkgew0KICAJcmV0dXJuIEdMVV9JTlZB TElEX0VOVU07DQogICAgICB9DQotLS0gMzIzMCwzMjM1IC0tLS0NCioqKioqKioqKioqKioqKg0K KioqIDMyNzAsMzM0NCAqKioqDQogICAgICB9DQogIH0NCiAgDQotIC8qICovDQotIHN0YXRpYyBH TGJvb2xlYW4gaXNMZWdhbEludGVybmFsRm9ybWF0KEdMZW51bSBpbnRlcm5hbEZvcm1hdCkNCi0g ew0KLSAgICBzd2l0Y2ggKGludGVybmFsRm9ybWF0KSB7DQotICAgICAgIC8qIGludGVybmFsIGZv cm1hdHMgWzEuLjRdIGFyZSBhbHdheXMgdmFsaWQgKi8NCi0gICAgICAgY2FzZSAxOiBjYXNlIDI6 IGNhc2UgMzogY2FzZSA0Og0KLSAgICAgICAgICByZXR1cm4gR0xfVFJVRTsNCi0gDQotICAgICAg IGNhc2UgR0xfQUxQSEE6DQotICAgICAgIGNhc2UgR0xfQUxQSEE0Og0KLSAgICAgICBjYXNlIEdM X0FMUEhBODoNCi0gICAgICAgY2FzZSBHTF9BTFBIQTEyOg0KLSAgICAgICBjYXNlIEdMX0FMUEhB MTY6DQotIA0KLSAgICAgICBjYXNlIEdMX0xVTUlOQU5DRTogDQotICAgICAgIGNhc2UgR0xfTFVN SU5BTkNFNDogDQotICAgICAgIGNhc2UgR0xfTFVNSU5BTkNFODogDQotICAgICAgIGNhc2UgR0xf TFVNSU5BTkNFMTI6IA0KLSAgICAgICBjYXNlIEdMX0xVTUlOQU5DRTE2Og0KLSANCi0gICAgICAg Y2FzZSBHTF9MVU1JTkFOQ0VfQUxQSEE6DQotICAgICAgIGNhc2UgR0xfTFVNSU5BTkNFNF9BTFBI QTQ6DQotICAgICAgIGNhc2UgR0xfTFVNSU5BTkNFNl9BTFBIQTI6DQotICAgICAgIGNhc2UgR0xf TFVNSU5BTkNFOF9BTFBIQTg6DQotICAgICAgIGNhc2UgR0xfTFVNSU5BTkNFMTJfQUxQSEE0Og0K LSAgICAgICBjYXNlIEdMX0xVTUlOQU5DRTEyX0FMUEhBMTI6DQotICAgICAgIGNhc2UgR0xfTFVN SU5BTkNFMTZfQUxQSEExNjoNCi0gDQotICAgICAgIGNhc2UgR0xfSU5URU5TSVRZOg0KLSAgICAg ICBjYXNlIEdMX0lOVEVOU0lUWTQ6CQ0KLSAgICAgICBjYXNlIEdMX0lOVEVOU0lUWTg6DQotICAg ICAgIGNhc2UgR0xfSU5URU5TSVRZMTI6DQotICAgICAgIGNhc2UgR0xfSU5URU5TSVRZMTY6DQot IA0KLSAgICAgICBjYXNlIEdMX1JHQjoNCi0gI2lmZGVmIEdMX0VYVF90ZXh0dXJlDQotICAgICAg IGNhc2UgR0xfUkdCMl9FWFQ6DQotICNlbmRpZg0KLSAgICAgICBjYXNlIEdMX1IzX0czX0IyOg0K LSAgICAgICBjYXNlIEdMX1JHQjQ6DQotICAgICAgIGNhc2UgR0xfUkdCNToNCi0gICAgICAgY2Fz ZSBHTF9SR0I4Og0KLSAgICAgICBjYXNlIEdMX1JHQjEwOg0KLSAgICAgICBjYXNlIEdMX1JHQjEy Og0KLSAgICAgICBjYXNlIEdMX1JHQjE2Og0KLSANCi0gICAgICAgY2FzZSBHTF9SR0JBOg0KLSAg ICAgICBjYXNlIEdMX1JHQkEyOg0KLSAgICAgICBjYXNlIEdMX1JHQkE0Og0KLSAgICAgICBjYXNl IEdMX1JHQjVfQTE6DQotICAgICAgIGNhc2UgR0xfUkdCQTg6DQotICAgICAgIGNhc2UgR0xfUkdC MTBfQTI6DQotICAgICAgIGNhc2UgR0xfUkdCQTEyOg0KLSAgICAgICBjYXNlIEdMX1JHQkExNjoN Ci0gCSAvKiBpZiBPR0wgMS4xKywgdGhlIG5ldyBpbnRlcm5hbCBmb3JtYXRzIGFyZSBsZWdhbCAN Ci0gCSAgKiBpZiBPR0wgPD0gMS4wLCB0aGUgbmV3IGludGVybmFsIGZvcm1hdHMgYXJlIGxlZ2Fs IGlmZiB0ZXh0dXJlDQotIAkgICogZXh0ZW5zaW9uIGlzIHN1cHBvcnRlZCwgb3RoZXJ3aXNlIHRo ZXkgYXJlIG5vdCBsZWdhbC4NCi0gICAgICAgICAgICovIA0KLSAgICAgICAgICBpZiAoc3RydG9k KChjb25zdCBjaGFyICopZ2xHZXRTdHJpbmcoR0xfVkVSU0lPTiksTlVMTCkgPj0gMS4xKQ0KLSAg CSAgICByZXR1cm4gR0xfVFJVRTsJLyogT0dMIDEuMSsgKi8NCi0gCSBlbHNlIGlmIChnbHVDaGVj a0V4dGVuc2lvbigiR0xfRVhUX3RleHR1cmUiLA0KLSAJCQkJICAgICAgZ2xHZXRTdHJpbmcoR0xf RVhURU5TSU9OUykpKSANCi0gCSAgICByZXR1cm4gR0xfVFJVRTsJLyogT0dMIDEuMCAmIHRleHR1 cmUgZXh0ZW5zaW9uIHN1cHBvcnRlZCAqLw0KLSAJIGVsc2UgcmV0dXJuIEdMX0ZBTFNFOwkvKiBP R0wgMS4wICYgdGV4dHVyZSBleHRlbnNpb24gbm90IHN1cHBvcnRlZCAqLw0KLSAgICAgICBkZWZh dWx0Og0KLSAJIHJldHVybiBHTF9GQUxTRTsNCi0gICAgfQ0KLSANCi0gfSAvKiBpc0xlZ2FsSW50 ZXJuYWxGb3JtYXQoKSAqLw0KICANCiAgc3RhdGljIEdMYm9vbGVhbiBsZWdhbFR5cGUoR0xlbnVt IHR5cGUpDQogIHsNCi0tLSAzMjY2LDMyNzEgLS0tLQ0KKioqKioqKioqKioqKioqDQoqKiogMzQ2 OSwzNDc2ICoqKioNCiAgCSAgICBnbFRleEltYWdlMkQocHJveHlUYXJnZXQsIDEsIC8qIG11c3Qg YmUgbm9uLXplcm8gKi8NCiAgCQkJIGludGVybmFsRm9ybWF0LA0KICAJCQkgd2lkdGhBdExldmVs T25lLGhlaWdodEF0TGV2ZWxPbmUsMCxmb3JtYXQsdHlwZSxOVUxMKTsNCiEgCSB9DQohIAkgZWxz ZSB7DQogIAkgICAgYXNzZXJ0KHRhcmdldCA9PSBHTF9URVhUVVJFXzFEIHx8IHRhcmdldCA9PSBH TF9QUk9YWV9URVhUVVJFXzFEKTsNCiAgCSAgICBwcm94eVRhcmdldCA9IEdMX1BST1hZX1RFWFRV UkVfMUQ7DQogIAkgICAgZ2xUZXhJbWFnZTFEKHByb3h5VGFyZ2V0LCAxLCAvKiBtdXN0IGJlIG5v bi16ZXJvICovDQotLS0gMzM5NiwzNDE2IC0tLS0NCiAgCSAgICBnbFRleEltYWdlMkQocHJveHlU YXJnZXQsIDEsIC8qIG11c3QgYmUgbm9uLXplcm8gKi8NCiAgCQkJIGludGVybmFsRm9ybWF0LA0K ICAJCQkgd2lkdGhBdExldmVsT25lLGhlaWdodEF0TGV2ZWxPbmUsMCxmb3JtYXQsdHlwZSxOVUxM KTsNCiEgCSB9IGVsc2UNCiEgI2lmIGRlZmluZWQoR0xfQVJCX3RleHR1cmVfY3ViZV9tYXApDQoh ICAgICAgICAgIGlmICgodGFyZ2V0ID09IEdMX1RFWFRVUkVfQ1VCRV9NQVBfUE9TSVRJVkVfWF9B UkIpIHx8DQohICAgICAgICAgICAgICAodGFyZ2V0ID09IEdMX1RFWFRVUkVfQ1VCRV9NQVBfTkVH QVRJVkVfWF9BUkIpIHx8DQohICAgICAgICAgICAgICAodGFyZ2V0ID09IEdMX1RFWFRVUkVfQ1VC RV9NQVBfUE9TSVRJVkVfWV9BUkIpIHx8DQohICAgICAgICAgICAgICAodGFyZ2V0ID09IEdMX1RF WFRVUkVfQ1VCRV9NQVBfTkVHQVRJVkVfWV9BUkIpIHx8DQohICAgICAgICAgICAgICAodGFyZ2V0 ID09IEdMX1RFWFRVUkVfQ1VCRV9NQVBfUE9TSVRJVkVfWl9BUkIpIHx8DQohICAgICAgICAgICAg ICAodGFyZ2V0ID09IEdMX1RFWFRVUkVfQ1VCRV9NQVBfTkVHQVRJVkVfWl9BUkIpKSB7DQohICAg ICAgICAgICAgICBwcm94eVRhcmdldCA9IEdMX1BST1hZX1RFWFRVUkVfQ1VCRV9NQVBfQVJCOw0K ISAgICAgICAgICAgICAgZ2xUZXhJbWFnZTJEKHByb3h5VGFyZ2V0LCAxLCAvKiBtdXN0IGJlIG5v bi16ZXJvICovDQohICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJuYWxGb3JtYXQsDQoh ICAgICAgICAgICAgICAgICAgICAgICAgICAgd2lkdGhBdExldmVsT25lLGhlaWdodEF0TGV2ZWxP bmUsMCxmb3JtYXQsdHlwZSxOVUxMKTsNCiEgICAgICAgICAgfSBlbHNlDQohICNlbmRpZiAvKiBH TF9BUkJfdGV4dHVyZV9jdWJlX21hcCAqLw0KISAgICAgICAgICB7DQogIAkgICAgYXNzZXJ0KHRh cmdldCA9PSBHTF9URVhUVVJFXzFEIHx8IHRhcmdldCA9PSBHTF9QUk9YWV9URVhUVVJFXzFEKTsN CiAgCSAgICBwcm94eVRhcmdldCA9IEdMX1BST1hZX1RFWFRVUkVfMUQ7DQogIAkgICAgZ2xUZXhJ bWFnZTFEKHByb3h5VGFyZ2V0LCAxLCAvKiBtdXN0IGJlIG5vbi16ZXJvICovDQo= --279767319-1244091998-980818888=:21898-- From owner-ogl-sample@oss.sgi.com Wed Jan 31 23:53:13 2001 Received: by oss.sgi.com id ; Wed, 31 Jan 2001 23:53:03 -0800 Received: from mail1.rdc1.sfba.home.com ([24.0.0.74]:23006 "EHLO mail1.rdc1.sfba.home.com") by oss.sgi.com with ESMTP id ; Wed, 31 Jan 2001 23:52:37 -0800 Received: from c130441-k.smateo1.sfba.home.com ([24.7.95.188]) by mail1.rdc1.sfba.home.com (InterMail vM.4.01.03.00 201-229-121) with ESMTP id <20010201064812.MAA918.mail1.rdc1.sfba.home.com@c130441-k.smateo1.sfba.home.com> for ; Wed, 31 Jan 2001 22:48:12 -0800 Received: from c130441-k.smateo1.sfba.home.com (dunwoody@localhost) by c130441-k.smateo1.sfba.home.com (8.11.1/8.11.1) with ESMTP id f116gv108141 for ; Wed, 31 Jan 2001 22:42:58 -0800 Message-Id: <200102010642.f116gv108141@c130441-k.smateo1.sfba.home.com> From: Craig Dunwoody To: ogl-sample@oss.sgi.com Subject: Re: [ogl-sample] GLU's mipmap.c In-Reply-To: Your message of "Mon, 29 Jan 2001 17:44:04 PST." Date: Wed, 31 Jan 2001 22:42:57 -0800 Sender: owner-ogl-sample@oss.sgi.com Precedence: bulk Reply-To: ogl-sample@oss.sgi.com Return-Path: X-Orcpt: rfc822;ogl-sample-outgoing ARitger@nvidia.com writes: > I've attached a patch to the file main/gfx/lib/glu/libutil/mipmap.c that > addresses two issues: > - relaxes argument checking for the gluBuildMipmaps routines > internalFormat argument; validating the internalFormat broke some > extensions. I suppose that you could add cases to the switch statement in > isLegalInternalFormat(), but this check will just break some other future > extension, and the error checking doesn't by anything because glTexImage* > will just do the same check itself. > - modified closestFit() to handle the GL_ARB_texture_cube_map extension. Thanks very much for the patch. I have checked it into the GLU CVS at oss.sgi.com, along with manpage changes documenting the resulting change in error behavior. Modified Files: main/doc/man/manglu/standard/build1dmipmaplevels.gl main/doc/man/manglu/standard/build1dmipmaps.gl main/doc/man/manglu/standard/build2dmipmaplevels.gl main/doc/man/manglu/standard/build2dmipmaps.gl main/doc/man/manglu/standard/build3dmipmaplevels.gl main/doc/man/manglu/standard/build3dmipmaps.gl main/gfx/lib/glu/libutil/mipmap.c I will work with the XFree86 folks to get this patch pulled into the mirrored copy of the SGI GLU implementation that is now part of XFree86. Craig Dunwoody dunwoody@sgi.com