GL_ARRAY_ELEMENT_LOCK_FIRST/COUNT_SGI changed to _EXT suffix

diff --git a/include/GL/gl.h b/include/GL/gl.h
index beea5a8157df93a48bf7be3fa61d69af161a0ae9..9cde2af134cff0f90938022717b2df97aa684eb7 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.28 2000/01/17 18:05:24 brianp Exp $ */
+/* $Id: gl.h,v 1.29 2000/02/05 01:51:54 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2122,8 +2122,8 @@ GLAPI void GLAPIENTRY glGetColorTableParameterivEXT( GLenum target, GLenum pname
 #ifndef GL_EXT_compiled_vertex_array
 #define GL_EXT_compiled_vertex_array 1
 
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_SGI                0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_SGI                0x81A9
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT                0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT                0x81A9
 
 GLAPI void GLAPIENTRY glLockArraysEXT( GLint first, GLsizei count );
 GLAPI void GLAPIENTRY glUnlockArraysEXT( void );

diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 3ee2c6fa29bd3218493461f694984a68c1380606..5dbda02dfb3b10072416b5a1a9234a8d95e6ec8d 100644 (file)
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1,10 +1,10 @@
-/* $Id: enums.c,v 1.5 1999/11/11 01:22:26 brianp Exp $ */
+/* $Id: enums.c,v 1.6 2000/02/05 01:52:05 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   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"),
@@ -795,8 +795,8 @@ enum_elt all_enums[] =
    { "GL_NATIVE_GRAPHICS_HANDLE_PGI", 107010 },
 
    /* GL_EXT_compiled_vertex_array */
-   { "GL_ARRAY_ELEMENT_LOCK_FIRST_SGI", 0x81A8},
-   { "GL_ARRAY_ELEMENT_LOCK_COUNT_SGI", 0x81A9},
+   { "GL_ARRAY_ELEMENT_LOCK_FIRST_EXT", 0x81A8},
+   { "GL_ARRAY_ELEMENT_LOCK_COUNT_EXT", 0x81A9},
 
    /* GL_EXT_clip_volume_hint */
    { "GL_CLIP_VOLUME_CLIPPING_HINT_EXT", 0x80F0}

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 04f1e42b8a52d00933b49e9b4cc231d3fe681716..b0a7fc677ef511f49d4752a15b9f655882b230a0 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,4 +1,4 @@
-/* $Id: get.c,v 1.10 2000/02/03 19:40:07 brianp Exp $ */
+/* $Id: get.c,v 1.11 2000/02/05 01:52:05 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -3812,11 +3812,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
         break;
 
       /* GL_EXT_compiled_vertex_array */
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_SGI:
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
         *params = ctx->Array.LockFirst;
         break;
-
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_SGI:
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
         *params = ctx->Array.LockCount;
         break;