dri: Rework planar image interface
[mesa.git] / src / glu / sgi / libutil / quad.c
index db397f09bfec5af30685564f8efd8e6b0f1cb0ca..d88b20f5566fbebe4b338e669007e5ec2ee12df5 100644 (file)
@@ -1,39 +1,32 @@
 /*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
-**
-** $Date: 2001/09/20 21:47:52 $ $Revision: 1.2 $
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/quad.c,v 1.2 2001/09/20 21:47:52 kschultz Exp $
-*/
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
 
 #include "gluos.h"
 #include "gluint.h"
 /* Make it not a power of two to avoid cache thrashing on the chip */
 #define CACHE_SIZE     240
 
-#define PI            3.14159265358979323846
+#undef PI
+#define PI           3.14159265358979323846
 
 struct GLUquadric {
-    GLint      normals;
+    GLint      normals;
     GLboolean  textureCoords;
     GLint      orientation;
     GLint      drawStyle;
@@ -70,7 +64,7 @@ gluNewQuadric(void)
     newstate->textureCoords = GL_FALSE;
     newstate->orientation = GLU_OUTSIDE;
     newstate->drawStyle = GLU_FILL;
-    newstate->errorCallback = NULL; 
+    newstate->errorCallback = NULL;
     return newstate;
 }
 
@@ -153,10 +147,10 @@ gluQuadricDrawStyle(GLUquadric *qobj, GLenum drawStyle)
 }
 
 void GLAPIENTRY
-gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius, 
+gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                GLdouble height, GLint slices, GLint stacks)
 {
-    GLint i,j,max;
+    GLint i,j;
     GLfloat sinCache[CACHE_SIZE];
     GLfloat cosCache[CACHE_SIZE];
     GLfloat sinCache2[CACHE_SIZE];
@@ -164,7 +158,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
     GLfloat sinCache3[CACHE_SIZE];
     GLfloat cosCache3[CACHE_SIZE];
     GLfloat angle;
-    GLfloat x, y, zLow, zHigh;
+    GLfloat zLow, zHigh;
     GLfloat sintemp, costemp;
     GLfloat length;
     GLfloat deltaRadius;
@@ -219,7 +213,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                sinCache2[i] = -xyNormalRatio * SIN(angle);
                cosCache2[i] = -xyNormalRatio * COS(angle);
            }
-       } 
+       }
        sinCache[i] = SIN(angle);
        cosCache[i] = COS(angle);
     }
@@ -235,7 +229,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                cosCache3[i] = -xyNormalRatio * COS(angle);
            }
        }
-    } 
+    }
 
     sinCache[slices] = sinCache[0];
     cosCache[slices] = cosCache[0];
@@ -252,8 +246,8 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
       case GLU_FILL:
        /* Note:
        ** An argument could be made for using a TRIANGLE_FAN for the end
-       ** of the cylinder of either radii is 0.0 (a cone).  However, a 
-       ** TRIANGLE_FAN would not work in smooth shading mode (the common 
+       ** of the cylinder of either radii is 0.0 (a cone).  However, a
+       ** TRIANGLE_FAN would not work in smooth shading mode (the common
        ** case) because the normal for the apex is different for every
        ** triangle (and TRIANGLE_FAN doesn't let me respecify that normal).
        ** Now, my choice is GL_TRIANGLES, or leave the GL_QUAD_STRIP and
@@ -285,26 +279,26 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                        glTexCoord2f(1 - (float) i / slices,
                                (float) j / stacks);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], zLow);
                    if (qobj->textureCoords) {
                        glTexCoord2f(1 - (float) i / slices,
                                (float) (j+1) / stacks);
                    }
-                   glVertex3f(radiusHigh * sinCache[i], 
+                   glVertex3f(radiusHigh * sinCache[i],
                            radiusHigh * cosCache[i], zHigh);
                } else {
                    if (qobj->textureCoords) {
                        glTexCoord2f(1 - (float) i / slices,
                                (float) (j+1) / stacks);
                    }
-                   glVertex3f(radiusHigh * sinCache[i], 
+                   glVertex3f(radiusHigh * sinCache[i],
                            radiusHigh * cosCache[i], zHigh);
                    if (qobj->textureCoords) {
                        glTexCoord2f(1 - (float) i / slices,
                                (float) j / stacks);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], zLow);
                }
            }
@@ -333,7 +327,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                    glTexCoord2f(1 - (float) i / slices,
                            (float) j / stacks);
                }
-               glVertex3f(radiusLow * sintemp, 
+               glVertex3f(radiusLow * sintemp,
                        radiusLow * costemp, zLow);
            }
        }
@@ -361,7 +355,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                    glTexCoord2f(1 - (float) i / slices,
                            (float) j / stacks);
                }
-               glVertex3f(radiusLow * sinCache[i], 
+               glVertex3f(radiusLow * sinCache[i],
                        radiusLow * cosCache[i], zLow);
            }
            glEnd();
@@ -389,7 +383,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                    glTexCoord2f(1 - (float) i / slices,
                            (float) j / stacks);
                }
-               glVertex3f(radiusLow * sinCache[i], radiusLow * cosCache[i], 
+               glVertex3f(radiusLow * sinCache[i], radiusLow * cosCache[i],
                        zLow);
            }
            glEnd();
@@ -415,7 +409,7 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
                    glTexCoord2f(1 - (float) i / slices,
                            (float) j / stacks);
                }
-               glVertex3f(radiusLow * sintemp, 
+               glVertex3f(radiusLow * sintemp,
                        radiusLow * costemp, zLow);
            }
            glEnd();
@@ -427,26 +421,25 @@ gluCylinder(GLUquadric *qobj, GLdouble baseRadius, GLdouble topRadius,
 }
 
 void GLAPIENTRY
-gluDisk(GLUquadric *qobj, GLdouble innerRadius, GLdouble outerRadius, 
+gluDisk(GLUquadric *qobj, GLdouble innerRadius, GLdouble outerRadius,
            GLint slices, GLint loops)
 {
     gluPartialDisk(qobj, innerRadius, outerRadius, slices, loops, 0.0, 360.0);
 }
 
 void GLAPIENTRY
-gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius, 
+gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                   GLdouble outerRadius, GLint slices, GLint loops,
                   GLdouble startAngle, GLdouble sweepAngle)
 {
-    GLint i,j,max;
+    GLint i,j;
     GLfloat sinCache[CACHE_SIZE];
     GLfloat cosCache[CACHE_SIZE];
     GLfloat angle;
-    GLfloat x, y;
     GLfloat sintemp, costemp;
     GLfloat deltaRadius;
     GLfloat radiusLow, radiusHigh;
-    GLfloat texLow, texHigh;
+    GLfloat texLow = 0.0, texHigh = 0.0;
     GLfloat angleOffset;
     GLint slices2;
     GLint finish;
@@ -512,7 +505,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                glTexCoord2f(0.5, 0.5);
            }
            glVertex3f(0.0, 0.0, 0.0);
-           radiusLow = outerRadius - 
+           radiusLow = outerRadius -
                    deltaRadius * ((float) (loops-1) / loops);
            if (qobj->textureCoords) {
                texLow = radiusLow / outerRadius / 2;
@@ -524,7 +517,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                        glTexCoord2f(texLow * sinCache[i] + 0.5,
                                texLow * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], 0.0);
                }
            } else {
@@ -533,7 +526,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                        glTexCoord2f(texLow * sinCache[i] + 0.5,
                                texLow * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], 0.0);
                }
            }
@@ -556,28 +549,28 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                        glTexCoord2f(texLow * sinCache[i] + 0.5,
                                texLow * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], 0.0);
 
                    if (qobj->textureCoords) {
                        glTexCoord2f(texHigh * sinCache[i] + 0.5,
                                texHigh * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusHigh * sinCache[i], 
+                   glVertex3f(radiusHigh * sinCache[i],
                            radiusHigh * cosCache[i], 0.0);
                } else {
                    if (qobj->textureCoords) {
                        glTexCoord2f(texHigh * sinCache[i] + 0.5,
                                texHigh * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusHigh * sinCache[i], 
+                   glVertex3f(radiusHigh * sinCache[i],
                            radiusHigh * cosCache[i], 0.0);
 
                    if (qobj->textureCoords) {
                        glTexCoord2f(texLow * sinCache[i] + 0.5,
                                texLow * cosCache[i] + 0.5);
                    }
-                   glVertex3f(radiusLow * sinCache[i], 
+                   glVertex3f(radiusLow * sinCache[i],
                            radiusLow * cosCache[i], 0.0);
                }
            }
@@ -630,7 +623,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                    glTexCoord2f(texLow * sinCache[i] + 0.5,
                            texLow * cosCache[i] + 0.5);
                }
-               glVertex3f(radiusLow * sinCache[i], 
+               glVertex3f(radiusLow * sinCache[i],
                        radiusLow * cosCache[i], 0.0);
            }
            glEnd();
@@ -685,7 +678,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
                    glTexCoord2f(texLow * sinCache[i] + 0.5,
                            texLow * cosCache[i] + 0.5);
                }
-               glVertex3f(radiusLow * sinCache[i], 
+               glVertex3f(radiusLow * sinCache[i],
                        radiusLow * cosCache[i], 0.0);
            }
            glEnd();
@@ -700,7 +693,7 @@ gluPartialDisk(GLUquadric *qobj, GLdouble innerRadius,
 void GLAPIENTRY
 gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
 {
-    GLint i,j,max;
+    GLint i,j;
     GLfloat sinCache1a[CACHE_SIZE];
     GLfloat cosCache1a[CACHE_SIZE];
     GLfloat sinCache2a[CACHE_SIZE];
@@ -714,11 +707,9 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
     GLfloat sinCache3b[CACHE_SIZE];
     GLfloat cosCache3b[CACHE_SIZE];
     GLfloat angle;
-    GLfloat x, y, zLow, zHigh;
-    GLfloat sintemp1, sintemp2, sintemp3, sintemp4;
-    GLfloat costemp1, costemp2, costemp3, costemp4;
-    GLfloat zNormal;
-    GLfloat xyNormalRatio;
+    GLfloat zLow, zHigh;
+    GLfloat sintemp1 = 0.0, sintemp2 = 0.0, sintemp3 = 0.0, sintemp4 = 0.0;
+    GLfloat costemp1 = 0.0, costemp2 = 0.0, costemp3 = 0.0, costemp4 = 0.0;
     GLboolean needCache2, needCache3;
     GLint start, finish;
 
@@ -791,7 +782,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                cosCache3b[j] = -COS(angle);
            }
        }
-    } 
+    }
 
     sinCache1a[slices] = sinCache1a[0];
     cosCache1a[slices] = cosCache1a[0];
@@ -972,7 +963,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                }
                break;
              default:
-               break;
+               break;
            }
 
            glBegin(GL_QUAD_STRIP);
@@ -1049,7 +1040,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                costemp2 = cosCache2b[j];
                break;
              default:
-               break;
+               break;
            }
            for (i = 0; i < slices; i++) {
                switch(qobj->normals) {
@@ -1070,7 +1061,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                    glTexCoord2f(1 - (float) i / slices,
                            1 - (float) j / stacks);
                }
-               glVertex3f(sintemp1 * sinCache1a[i], 
+               glVertex3f(sintemp1 * sinCache1a[i],
                        sintemp1 * cosCache1a[i], costemp1);
            }
        }
@@ -1112,7 +1103,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                    glTexCoord2f(1 - (float) i / slices,
                            1 - (float) j / stacks);
                }
-               glVertex3f(sintemp1 * sinCache1a[i], 
+               glVertex3f(sintemp1 * sinCache1a[i],
                        sintemp1 * cosCache1a[i], costemp1);
            }
            glEnd();
@@ -1152,7 +1143,7 @@ gluSphere(GLUquadric *qobj, GLdouble radius, GLint slices, GLint stacks)
                    glTexCoord2f(1 - (float) i / slices,
                            1 - (float) j / stacks);
                }
-               glVertex3f(sintemp1 * sinCache1b[j], 
+               glVertex3f(sintemp1 * sinCache1b[j],
                        costemp1 * sinCache1b[j], cosCache1b[j]);
            }
            glEnd();