From d3b805988ac88ce4602775bdb89261c356318693 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Mon, 29 Nov 2010 11:51:23 +0000
Subject: [PATCH] Put GL's *ext.h headers in GL subdir.

Because GL/gl.h often includes GL/glext.h first, which may be too old.
---
 glext.h => GL/glext.h   | 0
 glxext.h => GL/glxext.h | 0
 wglext.h => GL/wglext.h | 0
 glimports.hpp           | 6 +++---
 glxtrace.py             | 7 ++-----
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename glext.h => GL/glext.h (100%)
 rename glxext.h => GL/glxext.h (100%)
 rename wglext.h => GL/wglext.h (100%)

diff --git a/glext.h b/GL/glext.h
similarity index 100%
rename from glext.h
rename to GL/glext.h
diff --git a/glxext.h b/GL/glxext.h
similarity index 100%
rename from glxext.h
rename to GL/glxext.h
diff --git a/wglext.h b/GL/wglext.h
similarity index 100%
rename from wglext.h
rename to GL/wglext.h
diff --git a/glimports.hpp b/glimports.hpp
index c96a69d..46c8069 100644
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -42,7 +42,7 @@
 
 #include <GL/gl.h>
 
-#include "glext.h"
+#include <GL/glext.h>
 
 #ifndef GL_TEXTURE_INDEX_SIZE_EXT
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
@@ -50,7 +50,7 @@
 
 #ifdef WIN32
 
-#include "wglext.h"
+#include <GL/wglext.h>
 
 #define GLAPIENTRY __stdcall
 
@@ -76,7 +76,7 @@ typedef struct _WGLSWAP
 #else /* !WIN32 */
 
 #include <GL/glx.h>
-#include "glxext.h"
+#include <GL/glext.h>
 
 #endif /* !WIN32 */
 
diff --git a/glxtrace.py b/glxtrace.py
index 14aca2a..67ce552 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -59,11 +59,8 @@ if __name__ == '__main__':
     print '#include <stdlib.h>'
     print '#include <string.h>'
     print '#include <dlfcn.h>'
-    print '#include <X11/Xlib.h>'
-    print '#include <GL/gl.h>'
-    print '#include "glext.h"'
-    print '#include <GL/glx.h>'
-    print '#include "glxext.h"'
+    print
+    print '#include "glimports.hpp"'
     print
     print '#include "trace_write.hpp"'
     print '#include "glsize.hpp"'
-- 
2.43.0