Browse Source

GL_ARRAY_ELEMENT_LOCK_FIRST/COUNT_SGI changed to _EXT suffix

tags/mesa_3_3
Brian Paul 26 years ago
parent
commit
e69f1f54f9
3 changed files with 10 additions and 11 deletions
  1. 3
    3
      include/GL/gl.h
  2. 4
    4
      src/mesa/main/enums.c
  3. 3
    4
      src/mesa/main/get.c

+ 3
- 3
include/GL/gl.h View File

@@ -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 );

+ 4
- 4
src/mesa/main/enums.c View File

@@ -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}

+ 3
- 4
src/mesa/main/get.c View File

@@ -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;

Loading…
Cancel
Save