Merge branch 'drawarrays'

Conflicts:
	CMakeLists.txt

diff --cc CMakeLists.txt
index 1a2e3a0c22086386d3f52ec8ee2444c902b90e0f,9aec06fdd689f9c180d545b69cf718bda6276794..53d406e2050c0a5d5abfe9b8780f937a90591ca9
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -160,9 -166,9 +166,9 @@@ if (WIN32
      add_custom_command (
          OUTPUT wgltrace.cpp
          COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/wgltrace.cpp
-         DEPENDS wgltrace.py trace.py wglapi.py wglenum.py glapi.py glenum.py winapi.py stdapi.py
 -        DEPENDS wgltrace.py gltrace.py trace.py wglapi.py glapi.py glenum.py winapi.py stdapi.py
++        DEPENDS wgltrace.py gltrace.py trace.py wglapi.py wglenum.py glapi.py glenum.py winapi.py stdapi.py
      )
-     add_library (opengl SHARED opengl32.def wgltrace.cpp trace_write.cpp os_win32.cpp)
+     add_library (opengl SHARED opengl32.def wgltrace.cpp trace_write.cpp os_win32.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
      set_target_properties (opengl PROPERTIES
          PREFIX ""
          OUTPUT_NAME opengl32)

diff --cc glretrace.py
Simple merge

diff --cc glsize.hpp
Simple merge

diff --cc glxapi.py
index d117ed4ed983c85209e3a2e8a7e2baed1b378a4e,3d345b9e54ace3d03c69ff97401e5787c4f0aeb4..98237040fa134b2e13895131983d51f4d0a68843
--- 1/glxapi.py
--- 2/glxapi.py
+++ b/glxapi.py
@@@ -64,71 -54,9 +64,70 @@@ glxapi = API("GLX"
  
  PROC = Opaque("__GLXextFuncPtr")
  
- glxapi.add_functions(glapi.functions)
  glxapi.add_functions([
 +    # GLX
 +    Function(Pointer(XVisualInfo), "glXChooseVisual", [(Display, "dpy"), (Int, "screen"), (Pointer(Int), "attribList")]),
      Function(GLXContext, "glXCreateContext", [(Display, "dpy"), (Pointer(XVisualInfo), "vis"), (GLXContext, "shareList"), (Bool_, "direct")]),
 -    # TODO: the rest
 +    Function(Void, "glXDestroyContext",  [(Display, "dpy"), (GLXContext, "ctx")]),
 +    Function(Bool_, "glXMakeCurrent", [(Display, "dpy"), (GLXDrawable, "drawable"), (GLXContext, "ctx")]),
 +    Function(Void, "glXCopyContext", [(Display, "dpy"), (GLXContext, "src"), (GLXContext, "dst"),
 +                                      (ULong, "mask")]),
 +    Function(Void, "glXSwapBuffers", [(Display, "dpy"), (GLXDrawable, "drawable")]),
 +    Function(GLXPixmap, "glXCreateGLXPixmap", [(Display, "dpy"), (Pointer(XVisualInfo), "visual"),
 +                                               (Pixmap, "pixmap")]),
 +    Function(Void, "glXDestroyGLXPixmap", [(Display, "dpy"), (GLXPixmap, "pixmap")]),
 +    Function(Bool_, "glXQueryExtension", [(Display, "dpy"), (Pointer(Int), "errorb"), (Pointer(Int), "event")]),
 +    Function(Bool_, "glXQueryVersion", [(Display, "dpy"), (Pointer(Int), "maj"), (Pointer(Int), "min")]),
 +    Function(Bool_, "glXIsDirect", [(Display, "dpy"), (GLXContext, "ctx")]),
 +    Function(Int, "glXGetConfig", [(Display, "dpy"), (Pointer(XVisualInfo), "visual"),
 +                                    (Int, "attrib"), (Pointer(Int), "value")]),
 +    Function(GLXContext, "glXGetCurrentContext", [], sideeffects=False),
 +    Function(GLXDrawable, "glXGetCurrentDrawable", [], sideeffects=False),
 +    Function(Void, "glXWaitGL", []),
 +    Function(Void, "glXWaitX", []),
 +    Function(Void, "glXUseXFont", [(Font, "font"), (Int, "first"), (Int, "count"), (Int, "list")]),
 +
 +    # GLX 1.1 and later
 +    Function((Const(String("char *"))), "glXQueryExtensionsString", [(Display, "dpy"), (Int, "screen")]),
 +    Function((Const(String("char *"))), "glXQueryServerString",  [(Display, "dpy"), (Int, "screen"), (Int, "name")]),
 +    Function((Const(String("char *"))), "glXGetClientString", [(Display, "dpy"), (Int, "name")]),
 +
 +    # GLX 1.2 and later
 +    Function(Display, "glXGetCurrentDisplay", [], sideeffects=False),
 +
 +    # GLX 1.3 and later
 +    Function(Pointer(GLXFBConfig), "glXChooseFBConfig", [(Display, "dpy"), (Int, "screen"),
 +                                                         (Pointer(Const(Int)), "attribList"), (Pointer(Int), "nitems")]),
 +    Function(Int, "glXGetFBConfigAttrib", [(Display, "dpy"), (GLXFBConfig, "config"),
 +                                            (Int, "attribute"), (Pointer(Int), "value")]),
 +    Function(Pointer(GLXFBConfig), "glXGetFBConfigs", [(Display, "dpy"), (Int, "screen"),
 +                                              (Pointer(Int), "nelements")]),
 +    Function(Pointer(XVisualInfo), "glXGetVisualFromFBConfig", [(Display, "dpy"),
 +                                                                (GLXFBConfig, "config")]),
 +    Function(GLXWindow, "glXCreateWindow", [(Display, "dpy"), (GLXFBConfig, "config"),
 +                                            (Window, "win"), (Pointer(Const(Int)), "attribList")]),
 +    Function(Void, "glXDestroyWindow", [(Display, "dpy"), (GLXWindow, "window")]),
 +    Function(GLXPixmap, "glXCreatePixmap", [(Display, "dpy"), (GLXFBConfig, "config"),
 +                                            (Pixmap, "pixmap"), (Pointer(Const(Int)), "attribList")]),
 +    Function(Void, "glXDestroyPixmap", [(Display, "dpy"), (GLXPixmap, "pixmap")]),
 +    Function(GLXPbuffer, "glXCreatePbuffer", [(Display, "dpy"), (GLXFBConfig, "config"),
 +                                              (Pointer(Const(Int)), "attribList")]),
 +    Function(Void, "glXDestroyPbuffer", [(Display, "dpy"), (GLXPbuffer, "pbuf")]),
 +    Function(Void, "glXQueryDrawable", [(Display, "dpy"), (GLXDrawable, "draw"), (Int, "attribute"),
 +                                        (Pointer(UInt), "value")]),
 +    Function(GLXContext, "glXCreateNewContext", [(Display, "dpy"), (GLXFBConfig, "config"),
 +                                                 (Int, "renderType"), (GLXContext, "shareList"),
 +                                                 (Bool_, "direct")]),
 +    Function(Bool_, "glXMakeContextCurrent", [(Display, "dpy"), (GLXDrawable, "draw"),
 +                                             (GLXDrawable, "read"), (GLXContext, "ctx")]),
 +    Function(GLXDrawable, "glXGetCurrentReadDrawable", []),
 +    Function(Int, "glXQueryContext", [(Display, "dpy"), (GLXContext, "ctx"), (Int, "attribute"),
 +                                      (Pointer(Int), "value")]),
 +    Function(Void, "glXSelectEvent", [(Display, "dpy"), (GLXDrawable, "drawable"),
 +                                      (ULong, "mask")]),
 +    Function(Void, "glXGetSelectedEvent", [(Display, "dpy"), (GLXDrawable, "drawable"),
 +                                           (Pointer(ULong), "mask")]),
 +    # TODO: extensions
  
      # Must be last
      Function(PROC, "glXGetProcAddressARB", [(Alias("const GLubyte *", CString), "procName")]),

diff --cc wglapi.py
Simple merge