From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 21 May 2004 15:51:13 +0000 (+0000)
Subject: remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27eb8fa35a76c7c9d79130d1fb9138dbeb455182;p=mesa.git

remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value
---

diff --git a/include/GL/glx.h b/include/GL/glx.h
index b34b2ceaec8..083634261cb 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.1
  * 
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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"),
@@ -111,8 +111,6 @@ extern "C" {
  */
 #define GLX_CONFIG_CAVEAT		0x20
 #define GLX_DONT_CARE			0xFFFFFFFF
-#define GLX_SLOW_CONFIG			0x8001
-#define GLX_NON_CONFORMANT_CONFIG	0x800D
 #define GLX_X_VISUAL_TYPE		0x22
 #define GLX_TRANSPARENT_TYPE		0x23
 #define GLX_TRANSPARENT_INDEX_VALUE	0x24
@@ -120,17 +118,6 @@ extern "C" {
 #define GLX_TRANSPARENT_GREEN_VALUE	0x26
 #define GLX_TRANSPARENT_BLUE_VALUE	0x27
 #define GLX_TRANSPARENT_ALPHA_VALUE	0x28
-#define GLX_MAX_PBUFFER_WIDTH		0x8016
-#define GLX_MAX_PBUFFER_HEIGHT		0x8017
-#define GLX_MAX_PBUFFER_PIXELS		0x8018
-#define GLX_PRESERVED_CONTENTS		0x801B
-#define GLX_LARGEST_PBUFFER		0x801C
-#define GLX_WIDTH			0x801D
-#define GLX_HEIGHT			0x801E
-#define GLX_EVENT_MASK			0x801F
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_FBCONFIG_ID			0x8013
-#define GLX_VISUAL_ID			0x800B
 #define GLX_WINDOW_BIT			0x00000001
 #define GLX_PIXMAP_BIT			0x00000002
 #define GLX_PBUFFER_BIT			0x00000004
@@ -142,10 +129,8 @@ extern "C" {
 #define GLX_DEPTH_BUFFER_BIT		0x00000020
 #define GLX_STENCIL_BUFFER_BIT		0x00000040
 #define GLX_ACCUM_BUFFER_BIT		0x00000080
-#define GLX_DRAWABLE_TYPE		0x8010
-#define GLX_RENDER_TYPE			0x8011
-#define GLX_X_RENDERABLE		0x8012
 #define GLX_NONE			0x8000
+#define GLX_SLOW_CONFIG			0x8001
 #define GLX_TRUE_COLOR			0x8002
 #define GLX_DIRECT_COLOR		0x8003
 #define GLX_PSEUDO_COLOR		0x8004
@@ -154,18 +139,32 @@ extern "C" {
 #define GLX_STATIC_GRAY			0x8007
 #define GLX_TRANSPARENT_RGB		0x8008
 #define GLX_TRANSPARENT_INDEX		0x8009
+#define GLX_VISUAL_ID			0x800B
+#define GLX_SCREEN			0x800C
+#define GLX_NON_CONFORMANT_CONFIG	0x800D
+#define GLX_DRAWABLE_TYPE		0x8010
+#define GLX_RENDER_TYPE			0x8011
+#define GLX_X_RENDERABLE		0x8012
+#define GLX_FBCONFIG_ID			0x8013
 #define GLX_RGBA_TYPE			0x8014
 #define GLX_COLOR_INDEX_TYPE		0x8015
-#define GLX_COLOR_INDEX_BIT		0x00000002
-#define GLX_RGBA_BIT			0x00000001
-#define GLX_SCREEN			0x800C
-#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
+#define GLX_MAX_PBUFFER_WIDTH		0x8016
+#define GLX_MAX_PBUFFER_HEIGHT		0x8017
+#define GLX_MAX_PBUFFER_PIXELS		0x8018
+#define GLX_PRESERVED_CONTENTS		0x801B
+#define GLX_LARGEST_PBUFFER		0x801C
+#define GLX_WIDTH			0x801D
+#define GLX_HEIGHT			0x801E
+#define GLX_EVENT_MASK			0x801F
 #define GLX_DAMAGED			0x8020
 #define GLX_SAVED			0x8021
 #define GLX_WINDOW			0x8022
 #define GLX_PBUFFER			0x8023
 #define GLX_PBUFFER_HEIGHT              0x8040
 #define GLX_PBUFFER_WIDTH               0x8041
+#define GLX_RGBA_BIT			0x00000001
+#define GLX_COLOR_INDEX_BIT		0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK	0x08000000
 
 
 /*