Merged tdfx-3-0-0tdfx-3-0-0-20010109-merge

1 files changed, 32 insertions, 23 deletions

diff --git a/xc/lib/GL/glx/g_vendpriv.c b/xc/lib/GL/glx/g_vendpriv.c
index b178ab811..b3258e9dc 100644
--- a/xc/lib/GL/glx/g_vendpriv.c
+++ b/xc/lib/GL/glx/g_vendpriv.c
@@ -1,26 +1,35 @@
-/* $XFree86: xc/lib/GL/glx/g_vendpriv.c,v 1.2 1999/06/14 07:23:36 dawes Exp $ */
 /*
-** The contents of this file are subject to the GLX Public License Version 1.0
-** (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, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-** or at http://www.sgi.com/software/opensource/glx/license.html.
+** 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:
 ** 
-** Software distributed under the License is distributed on an "AS IS"
-** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-** language governing rights and limitations under the License.
+** http://oss.sgi.com/projects/FreeB
 ** 
-** The Original Software is GLX version 1.2 source code, released February,
-** 1999. The developer of the Original Software is Silicon Graphics, Inc.
-** Those portions of the Subject Software created by Silicon Graphics, Inc.
-** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+** 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: 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.
 */
 
 #include "packvendpriv.h"
 
-GLboolean glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
+GLboolean glAreTexturesResidentEXT(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
 	__GLX_VENDPRIV_DECLARE_VARIABLES();
 	GLboolean    retval = 0;
@@ -28,7 +37,7 @@ GLboolean glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *re
 	__GLX_VENDPRIV_LOAD_VARIABLES();
 	if (n < 0) return retval;
 	cmdlen = 4+n*4;
-	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_AreTexturesResident,cmdlen);
+	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_AreTexturesResidentEXT,cmdlen);
 	__GLX_VENDPRIV_PUT_LONG(0,n);
 	__GLX_PUT_LONG_ARRAY(4,textures,n);
 	__GLX_VENDPRIV_READ_XREPLY();
@@ -38,37 +47,37 @@ GLboolean glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *re
 	return retval;
 }
 
-void glDeleteTextures(GLsizei n, const GLuint *textures)
+void glDeleteTexturesEXT(GLsizei n, const GLuint *textures)
 {
 	__GLX_VENDPRIV_DECLARE_VARIABLES();
 	__GLX_VENDPRIV_LOAD_VARIABLES();
 	if (n < 0) return;
 	cmdlen = 4+n*4;
-	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivate,X_GLvop_DeleteTextures,cmdlen);
+	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivate,X_GLvop_DeleteTexturesEXT,cmdlen);
 	__GLX_VENDPRIV_PUT_LONG(0,n);
 	__GLX_PUT_LONG_ARRAY(4,textures,n);
 	__GLX_VENDPRIV_END();
 }
 
-void glGenTextures(GLsizei n, GLuint *textures)
+void glGenTexturesEXT(GLsizei n, GLuint *textures)
 {
 	__GLX_VENDPRIV_DECLARE_VARIABLES();
 	xGLXVendorPrivReply reply;
 	__GLX_VENDPRIV_LOAD_VARIABLES();
-	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_GenTextures,4);
+	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_GenTexturesEXT,4);
 	__GLX_VENDPRIV_PUT_LONG(0,n);
 	__GLX_VENDPRIV_READ_XREPLY();
 	__GLX_VENDPRIV_GET_LONG_ARRAY(textures,n);
 	__GLX_VENDPRIV_END();
 }
 
-GLboolean glIsTexture(GLuint texture)
+GLboolean glIsTextureEXT(GLuint texture)
 {
 	__GLX_VENDPRIV_DECLARE_VARIABLES();
 	GLboolean    retval = 0;
 	xGLXVendorPrivReply reply;
 	__GLX_VENDPRIV_LOAD_VARIABLES();
-	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_IsTexture,4);
+	__GLX_VENDPRIV_BEGIN(X_GLXVendorPrivateWithReply,X_GLvop_IsTextureEXT,4);
 	__GLX_VENDPRIV_PUT_LONG(0,texture);
 	__GLX_VENDPRIV_READ_XREPLY();
 	__GLX_VENDPRIV_GET_RETVAL(retval, GLboolean);