Synchronised line endinge with release branch

2 files changed, 1253 insertions, 1253 deletions

diff --git a/mesalib/include/GL/glu.h b/mesalib/include/GL/glu.h
index fe7b03100..ba2228d8d 100644
--- a/mesalib/include/GL/glu.h
+++ b/mesalib/include/GL/glu.h
@@ -1,353 +1,353 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, Inc. 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"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

- * shall be included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF

- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- *

- * Except as contained in this notice, the name of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifndef __glu_h__

-#define __glu_h__

-

-#if defined(USE_MGL_NAMESPACE)

-#include "glu_mangle.h"

-#endif

-

-#include <GL/gl.h>

-

-#ifndef GLAPIENTRY

-#if defined(_MSC_VER) || defined(__MINGW32__)

-#define GLAPIENTRY __stdcall

-#else

-#define GLAPIENTRY

-#endif

-#endif

-

-#ifndef GLAPIENTRYP

-#define GLAPIENTRYP GLAPIENTRY *

-#endif

-

-#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)

-# undef GLAPI

-# define GLAPI __declspec(dllexport)

-#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL)

-/* tag specifying we're building for DLL runtime support */

-# undef GLAPI

-# define GLAPI __declspec(dllimport)

-#elif !defined(GLAPI)

-/* for use with static link lib build of Win32 edition only */

-# define GLAPI extern

-#endif /* _STATIC_MESA support */

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/*************************************************************/

-

-/* Extensions */

-#define GLU_EXT_object_space_tess          1

-#define GLU_EXT_nurbs_tessellator          1

-

-/* Boolean */

-#define GLU_FALSE                          0

-#define GLU_TRUE                           1

-

-/* Version */

-#define GLU_VERSION_1_1                    1

-#define GLU_VERSION_1_2                    1

-#define GLU_VERSION_1_3                    1

-

-/* StringName */

-#define GLU_VERSION                        100800

-#define GLU_EXTENSIONS                     100801

-

-/* ErrorCode */

-#define GLU_INVALID_ENUM                   100900

-#define GLU_INVALID_VALUE                  100901

-#define GLU_OUT_OF_MEMORY                  100902

-#define GLU_INCOMPATIBLE_GL_VERSION        100903

-#define GLU_INVALID_OPERATION              100904

-

-/* NurbsDisplay */

-/*      GLU_FILL */

-#define GLU_OUTLINE_POLYGON                100240

-#define GLU_OUTLINE_PATCH                  100241

-

-/* NurbsCallback */

-#define GLU_NURBS_ERROR                    100103

-#define GLU_ERROR                          100103

-#define GLU_NURBS_BEGIN                    100164

-#define GLU_NURBS_BEGIN_EXT                100164

-#define GLU_NURBS_VERTEX                   100165

-#define GLU_NURBS_VERTEX_EXT               100165

-#define GLU_NURBS_NORMAL                   100166

-#define GLU_NURBS_NORMAL_EXT               100166

-#define GLU_NURBS_COLOR                    100167

-#define GLU_NURBS_COLOR_EXT                100167

-#define GLU_NURBS_TEXTURE_COORD            100168

-#define GLU_NURBS_TEX_COORD_EXT            100168

-#define GLU_NURBS_END                      100169

-#define GLU_NURBS_END_EXT                  100169

-#define GLU_NURBS_BEGIN_DATA               100170

-#define GLU_NURBS_BEGIN_DATA_EXT           100170

-#define GLU_NURBS_VERTEX_DATA              100171

-#define GLU_NURBS_VERTEX_DATA_EXT          100171

-#define GLU_NURBS_NORMAL_DATA              100172

-#define GLU_NURBS_NORMAL_DATA_EXT          100172

-#define GLU_NURBS_COLOR_DATA               100173

-#define GLU_NURBS_COLOR_DATA_EXT           100173

-#define GLU_NURBS_TEXTURE_COORD_DATA       100174

-#define GLU_NURBS_TEX_COORD_DATA_EXT       100174

-#define GLU_NURBS_END_DATA                 100175

-#define GLU_NURBS_END_DATA_EXT             100175

-

-/* NurbsError */

-#define GLU_NURBS_ERROR1                   100251

-#define GLU_NURBS_ERROR2                   100252

-#define GLU_NURBS_ERROR3                   100253

-#define GLU_NURBS_ERROR4                   100254

-#define GLU_NURBS_ERROR5                   100255

-#define GLU_NURBS_ERROR6                   100256

-#define GLU_NURBS_ERROR7                   100257

-#define GLU_NURBS_ERROR8                   100258

-#define GLU_NURBS_ERROR9                   100259

-#define GLU_NURBS_ERROR10                  100260

-#define GLU_NURBS_ERROR11                  100261

-#define GLU_NURBS_ERROR12                  100262

-#define GLU_NURBS_ERROR13                  100263

-#define GLU_NURBS_ERROR14                  100264

-#define GLU_NURBS_ERROR15                  100265

-#define GLU_NURBS_ERROR16                  100266

-#define GLU_NURBS_ERROR17                  100267

-#define GLU_NURBS_ERROR18                  100268

-#define GLU_NURBS_ERROR19                  100269

-#define GLU_NURBS_ERROR20                  100270

-#define GLU_NURBS_ERROR21                  100271

-#define GLU_NURBS_ERROR22                  100272

-#define GLU_NURBS_ERROR23                  100273

-#define GLU_NURBS_ERROR24                  100274

-#define GLU_NURBS_ERROR25                  100275

-#define GLU_NURBS_ERROR26                  100276

-#define GLU_NURBS_ERROR27                  100277

-#define GLU_NURBS_ERROR28                  100278

-#define GLU_NURBS_ERROR29                  100279

-#define GLU_NURBS_ERROR30                  100280

-#define GLU_NURBS_ERROR31                  100281

-#define GLU_NURBS_ERROR32                  100282

-#define GLU_NURBS_ERROR33                  100283

-#define GLU_NURBS_ERROR34                  100284

-#define GLU_NURBS_ERROR35                  100285

-#define GLU_NURBS_ERROR36                  100286

-#define GLU_NURBS_ERROR37                  100287

-

-/* NurbsProperty */

-#define GLU_AUTO_LOAD_MATRIX               100200

-#define GLU_CULLING                        100201

-#define GLU_SAMPLING_TOLERANCE             100203

-#define GLU_DISPLAY_MODE                   100204

-#define GLU_PARAMETRIC_TOLERANCE           100202

-#define GLU_SAMPLING_METHOD                100205

-#define GLU_U_STEP                         100206

-#define GLU_V_STEP                         100207

-#define GLU_NURBS_MODE                     100160

-#define GLU_NURBS_MODE_EXT                 100160

-#define GLU_NURBS_TESSELLATOR              100161

-#define GLU_NURBS_TESSELLATOR_EXT          100161

-#define GLU_NURBS_RENDERER                 100162

-#define GLU_NURBS_RENDERER_EXT             100162

-

-/* NurbsSampling */

-#define GLU_OBJECT_PARAMETRIC_ERROR        100208

-#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208

-#define GLU_OBJECT_PATH_LENGTH             100209

-#define GLU_OBJECT_PATH_LENGTH_EXT         100209

-#define GLU_PATH_LENGTH                    100215

-#define GLU_PARAMETRIC_ERROR               100216

-#define GLU_DOMAIN_DISTANCE                100217

-

-/* NurbsTrim */

-#define GLU_MAP1_TRIM_2                    100210

-#define GLU_MAP1_TRIM_3                    100211

-

-/* QuadricDrawStyle */

-#define GLU_POINT                          100010

-#define GLU_LINE                           100011

-#define GLU_FILL                           100012

-#define GLU_SILHOUETTE                     100013

-

-/* QuadricCallback */

-/*      GLU_ERROR */

-

-/* QuadricNormal */

-#define GLU_SMOOTH                         100000

-#define GLU_FLAT                           100001

-#define GLU_NONE                           100002

-

-/* QuadricOrientation */

-#define GLU_OUTSIDE                        100020

-#define GLU_INSIDE                         100021

-

-/* TessCallback */

-#define GLU_TESS_BEGIN                     100100

-#define GLU_BEGIN                          100100

-#define GLU_TESS_VERTEX                    100101

-#define GLU_VERTEX                         100101

-#define GLU_TESS_END                       100102

-#define GLU_END                            100102

-#define GLU_TESS_ERROR                     100103

-#define GLU_TESS_EDGE_FLAG                 100104

-#define GLU_EDGE_FLAG                      100104

-#define GLU_TESS_COMBINE                   100105

-#define GLU_TESS_BEGIN_DATA                100106

-#define GLU_TESS_VERTEX_DATA               100107

-#define GLU_TESS_END_DATA                  100108

-#define GLU_TESS_ERROR_DATA                100109

-#define GLU_TESS_EDGE_FLAG_DATA            100110

-#define GLU_TESS_COMBINE_DATA              100111

-

-/* TessContour */

-#define GLU_CW                             100120

-#define GLU_CCW                            100121

-#define GLU_INTERIOR                       100122

-#define GLU_EXTERIOR                       100123

-#define GLU_UNKNOWN                        100124

-

-/* TessProperty */

-#define GLU_TESS_WINDING_RULE              100140

-#define GLU_TESS_BOUNDARY_ONLY             100141

-#define GLU_TESS_TOLERANCE                 100142

-

-/* TessError */

-#define GLU_TESS_ERROR1                    100151

-#define GLU_TESS_ERROR2                    100152

-#define GLU_TESS_ERROR3                    100153

-#define GLU_TESS_ERROR4                    100154

-#define GLU_TESS_ERROR5                    100155

-#define GLU_TESS_ERROR6                    100156

-#define GLU_TESS_ERROR7                    100157

-#define GLU_TESS_ERROR8                    100158

-#define GLU_TESS_MISSING_BEGIN_POLYGON     100151

-#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152

-#define GLU_TESS_MISSING_END_POLYGON       100153

-#define GLU_TESS_MISSING_END_CONTOUR       100154

-#define GLU_TESS_COORD_TOO_LARGE           100155

-#define GLU_TESS_NEED_COMBINE_CALLBACK     100156

-

-/* TessWinding */

-#define GLU_TESS_WINDING_ODD               100130

-#define GLU_TESS_WINDING_NONZERO           100131

-#define GLU_TESS_WINDING_POSITIVE          100132

-#define GLU_TESS_WINDING_NEGATIVE          100133

-#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134

-

-/*************************************************************/

-

-

-#ifdef __cplusplus

-class GLUnurbs;

-class GLUquadric;

-class GLUtesselator;

-#else

-typedef struct GLUnurbs GLUnurbs;

-typedef struct GLUquadric GLUquadric;

-typedef struct GLUtesselator GLUtesselator;

-#endif

-

-typedef GLUnurbs GLUnurbsObj;

-typedef GLUquadric GLUquadricObj;

-typedef GLUtesselator GLUtesselatorObj;

-typedef GLUtesselator GLUtriangulatorObj;

-

-#define GLU_TESS_MAX_COORD 1.0e150

-

-/* Internal convenience typedefs */

-typedef void (GLAPIENTRYP _GLUfuncptr)(void);

-

-GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);

-GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);

-GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);

-GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);

-GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);

-GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);

-GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);

-GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);

-GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);

-GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);

-GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);

-GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);

-GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);

-GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);

-GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);

-GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);

-GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);

-GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);

-GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);

-GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);

-GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);

-GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);

-GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);

-GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);

-GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);

-GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);

-GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);

-GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);

-GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);

-GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);

-GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);

-GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);

-GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);

-GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);

-GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);

-GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);

-GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);

-GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);

-GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);

-GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);

-GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);

-GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);

-GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);

-GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);

-GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);

-GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);

-GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);

-GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);

-GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);

-GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);

-GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);

-GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);

-GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);

-GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* __glu_h__ */

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. 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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifndef __glu_h__
+#define __glu_h__
+
+#if defined(USE_MGL_NAMESPACE)
+#include "glu_mangle.h"
+#endif
+
+#include <GL/gl.h>
+
+#ifndef GLAPIENTRY
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define GLAPIENTRY __stdcall
+#else
+#define GLAPIENTRY
+#endif
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
+# undef GLAPI
+# define GLAPI __declspec(dllexport)
+#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL)
+/* tag specifying we're building for DLL runtime support */
+# undef GLAPI
+# define GLAPI __declspec(dllimport)
+#elif !defined(GLAPI)
+/* for use with static link lib build of Win32 edition only */
+# define GLAPI extern
+#endif /* _STATIC_MESA support */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************/
+
+/* Extensions */
+#define GLU_EXT_object_space_tess          1
+#define GLU_EXT_nurbs_tessellator          1
+
+/* Boolean */
+#define GLU_FALSE                          0
+#define GLU_TRUE                           1
+
+/* Version */
+#define GLU_VERSION_1_1                    1
+#define GLU_VERSION_1_2                    1
+#define GLU_VERSION_1_3                    1
+
+/* StringName */
+#define GLU_VERSION                        100800
+#define GLU_EXTENSIONS                     100801
+
+/* ErrorCode */
+#define GLU_INVALID_ENUM                   100900
+#define GLU_INVALID_VALUE                  100901
+#define GLU_OUT_OF_MEMORY                  100902
+#define GLU_INCOMPATIBLE_GL_VERSION        100903
+#define GLU_INVALID_OPERATION              100904
+
+/* NurbsDisplay */
+/*      GLU_FILL */
+#define GLU_OUTLINE_POLYGON                100240
+#define GLU_OUTLINE_PATCH                  100241
+
+/* NurbsCallback */
+#define GLU_NURBS_ERROR                    100103
+#define GLU_ERROR                          100103
+#define GLU_NURBS_BEGIN                    100164
+#define GLU_NURBS_BEGIN_EXT                100164
+#define GLU_NURBS_VERTEX                   100165
+#define GLU_NURBS_VERTEX_EXT               100165
+#define GLU_NURBS_NORMAL                   100166
+#define GLU_NURBS_NORMAL_EXT               100166
+#define GLU_NURBS_COLOR                    100167
+#define GLU_NURBS_COLOR_EXT                100167
+#define GLU_NURBS_TEXTURE_COORD            100168
+#define GLU_NURBS_TEX_COORD_EXT            100168
+#define GLU_NURBS_END                      100169
+#define GLU_NURBS_END_EXT                  100169
+#define GLU_NURBS_BEGIN_DATA               100170
+#define GLU_NURBS_BEGIN_DATA_EXT           100170
+#define GLU_NURBS_VERTEX_DATA              100171
+#define GLU_NURBS_VERTEX_DATA_EXT          100171
+#define GLU_NURBS_NORMAL_DATA              100172
+#define GLU_NURBS_NORMAL_DATA_EXT          100172
+#define GLU_NURBS_COLOR_DATA               100173
+#define GLU_NURBS_COLOR_DATA_EXT           100173
+#define GLU_NURBS_TEXTURE_COORD_DATA       100174
+#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
+#define GLU_NURBS_END_DATA                 100175
+#define GLU_NURBS_END_DATA_EXT             100175
+
+/* NurbsError */
+#define GLU_NURBS_ERROR1                   100251
+#define GLU_NURBS_ERROR2                   100252
+#define GLU_NURBS_ERROR3                   100253
+#define GLU_NURBS_ERROR4                   100254
+#define GLU_NURBS_ERROR5                   100255
+#define GLU_NURBS_ERROR6                   100256
+#define GLU_NURBS_ERROR7                   100257
+#define GLU_NURBS_ERROR8                   100258
+#define GLU_NURBS_ERROR9                   100259
+#define GLU_NURBS_ERROR10                  100260
+#define GLU_NURBS_ERROR11                  100261
+#define GLU_NURBS_ERROR12                  100262
+#define GLU_NURBS_ERROR13                  100263
+#define GLU_NURBS_ERROR14                  100264
+#define GLU_NURBS_ERROR15                  100265
+#define GLU_NURBS_ERROR16                  100266
+#define GLU_NURBS_ERROR17                  100267
+#define GLU_NURBS_ERROR18                  100268
+#define GLU_NURBS_ERROR19                  100269
+#define GLU_NURBS_ERROR20                  100270
+#define GLU_NURBS_ERROR21                  100271
+#define GLU_NURBS_ERROR22                  100272
+#define GLU_NURBS_ERROR23                  100273
+#define GLU_NURBS_ERROR24                  100274
+#define GLU_NURBS_ERROR25                  100275
+#define GLU_NURBS_ERROR26                  100276
+#define GLU_NURBS_ERROR27                  100277
+#define GLU_NURBS_ERROR28                  100278
+#define GLU_NURBS_ERROR29                  100279
+#define GLU_NURBS_ERROR30                  100280
+#define GLU_NURBS_ERROR31                  100281
+#define GLU_NURBS_ERROR32                  100282
+#define GLU_NURBS_ERROR33                  100283
+#define GLU_NURBS_ERROR34                  100284
+#define GLU_NURBS_ERROR35                  100285
+#define GLU_NURBS_ERROR36                  100286
+#define GLU_NURBS_ERROR37                  100287
+
+/* NurbsProperty */
+#define GLU_AUTO_LOAD_MATRIX               100200
+#define GLU_CULLING                        100201
+#define GLU_SAMPLING_TOLERANCE             100203
+#define GLU_DISPLAY_MODE                   100204
+#define GLU_PARAMETRIC_TOLERANCE           100202
+#define GLU_SAMPLING_METHOD                100205
+#define GLU_U_STEP                         100206
+#define GLU_V_STEP                         100207
+#define GLU_NURBS_MODE                     100160
+#define GLU_NURBS_MODE_EXT                 100160
+#define GLU_NURBS_TESSELLATOR              100161
+#define GLU_NURBS_TESSELLATOR_EXT          100161
+#define GLU_NURBS_RENDERER                 100162
+#define GLU_NURBS_RENDERER_EXT             100162
+
+/* NurbsSampling */
+#define GLU_OBJECT_PARAMETRIC_ERROR        100208
+#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
+#define GLU_OBJECT_PATH_LENGTH             100209
+#define GLU_OBJECT_PATH_LENGTH_EXT         100209
+#define GLU_PATH_LENGTH                    100215
+#define GLU_PARAMETRIC_ERROR               100216
+#define GLU_DOMAIN_DISTANCE                100217
+
+/* NurbsTrim */
+#define GLU_MAP1_TRIM_2                    100210
+#define GLU_MAP1_TRIM_3                    100211
+
+/* QuadricDrawStyle */
+#define GLU_POINT                          100010
+#define GLU_LINE                           100011
+#define GLU_FILL                           100012
+#define GLU_SILHOUETTE                     100013
+
+/* QuadricCallback */
+/*      GLU_ERROR */
+
+/* QuadricNormal */
+#define GLU_SMOOTH                         100000
+#define GLU_FLAT                           100001
+#define GLU_NONE                           100002
+
+/* QuadricOrientation */
+#define GLU_OUTSIDE                        100020
+#define GLU_INSIDE                         100021
+
+/* TessCallback */
+#define GLU_TESS_BEGIN                     100100
+#define GLU_BEGIN                          100100
+#define GLU_TESS_VERTEX                    100101
+#define GLU_VERTEX                         100101
+#define GLU_TESS_END                       100102
+#define GLU_END                            100102
+#define GLU_TESS_ERROR                     100103
+#define GLU_TESS_EDGE_FLAG                 100104
+#define GLU_EDGE_FLAG                      100104
+#define GLU_TESS_COMBINE                   100105
+#define GLU_TESS_BEGIN_DATA                100106
+#define GLU_TESS_VERTEX_DATA               100107
+#define GLU_TESS_END_DATA                  100108
+#define GLU_TESS_ERROR_DATA                100109
+#define GLU_TESS_EDGE_FLAG_DATA            100110
+#define GLU_TESS_COMBINE_DATA              100111
+
+/* TessContour */
+#define GLU_CW                             100120
+#define GLU_CCW                            100121
+#define GLU_INTERIOR                       100122
+#define GLU_EXTERIOR                       100123
+#define GLU_UNKNOWN                        100124
+
+/* TessProperty */
+#define GLU_TESS_WINDING_RULE              100140
+#define GLU_TESS_BOUNDARY_ONLY             100141
+#define GLU_TESS_TOLERANCE                 100142
+
+/* TessError */
+#define GLU_TESS_ERROR1                    100151
+#define GLU_TESS_ERROR2                    100152
+#define GLU_TESS_ERROR3                    100153
+#define GLU_TESS_ERROR4                    100154
+#define GLU_TESS_ERROR5                    100155
+#define GLU_TESS_ERROR6                    100156
+#define GLU_TESS_ERROR7                    100157
+#define GLU_TESS_ERROR8                    100158
+#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
+#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
+#define GLU_TESS_MISSING_END_POLYGON       100153
+#define GLU_TESS_MISSING_END_CONTOUR       100154
+#define GLU_TESS_COORD_TOO_LARGE           100155
+#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
+
+/* TessWinding */
+#define GLU_TESS_WINDING_ODD               100130
+#define GLU_TESS_WINDING_NONZERO           100131
+#define GLU_TESS_WINDING_POSITIVE          100132
+#define GLU_TESS_WINDING_NEGATIVE          100133
+#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
+
+/*************************************************************/
+
+
+#ifdef __cplusplus
+class GLUnurbs;
+class GLUquadric;
+class GLUtesselator;
+#else
+typedef struct GLUnurbs GLUnurbs;
+typedef struct GLUquadric GLUquadric;
+typedef struct GLUtesselator GLUtesselator;
+#endif
+
+typedef GLUnurbs GLUnurbsObj;
+typedef GLUquadric GLUquadricObj;
+typedef GLUtesselator GLUtesselatorObj;
+typedef GLUtesselator GLUtriangulatorObj;
+
+#define GLU_TESS_MAX_COORD 1.0e150
+
+/* Internal convenience typedefs */
+typedef void (GLAPIENTRYP _GLUfuncptr)(void);
+
+GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
+GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);
+GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
+GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);
+GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);
+GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
+GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);
+GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
+GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
+GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
+GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);
+GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);
+GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);
+GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
+GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
+GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
+GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
+GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
+GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
+GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
+GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
+GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
+GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
+GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
+GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
+GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
+GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
+GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
+GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
+GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
+GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __glu_h__ */
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 54b9b0de8..76e48a06b 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -1,900 +1,900 @@
-/*

- * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

- * Copyright 2007-2008 Red Hat, Inc.

- * (C) Copyright IBM Corporation 2004

- * 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"),

- * to deal in the Software without restriction, including without limitation

- * on the rights to use, copy, modify, merge, publish, distribute, sub

- * license, and/or sell copies of the Software, and to permit persons to whom

- * the Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the next

- * paragraph) shall be included in all copies or substantial portions of the

- * Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

- * USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/**

- * \file dri_interface.h

- *

- * This file contains all the types and functions that define the interface

- * between a DRI driver and driver loader.  Currently, the most common driver

- * loader is the XFree86 libGL.so.  However, other loaders do exist, and in

- * the future the server-side libglx.a will also be a loader.

- * 

- * \author Kevin E. Martin <kevin@precisioninsight.com>

- * \author Ian Romanick <idr@us.ibm.com>

- * \author Kristian Høgsberg <krh@redhat.com>

- */

-

-#ifndef DRI_INTERFACE_H

-#define DRI_INTERFACE_H

-

-/* For archs with no drm.h */

-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(_MSC_VER)

-#ifndef __NOT_HAVE_DRM_H

-#define __NOT_HAVE_DRM_H

-#endif

-#endif

-

-#ifndef __NOT_HAVE_DRM_H

-#include <drm.h>

-#else

-typedef unsigned int drm_context_t;

-typedef unsigned int drm_drawable_t;

-typedef struct drm_clip_rect drm_clip_rect_t;

-#endif

-

-/**

- * \name DRI interface structures

- *

- * The following structures define the interface between the GLX client

- * side library and the DRI (direct rendering infrastructure).

- */

-/*@{*/

-typedef struct __DRIdisplayRec		__DRIdisplay;

-typedef struct __DRIscreenRec		__DRIscreen;

-typedef struct __DRIcontextRec		__DRIcontext;

-typedef struct __DRIdrawableRec		__DRIdrawable;

-typedef struct __DRIconfigRec		__DRIconfig;

-typedef struct __DRIframebufferRec	__DRIframebuffer;

-typedef struct __DRIversionRec		__DRIversion;

-

-typedef struct __DRIcoreExtensionRec		__DRIcoreExtension;

-typedef struct __DRIextensionRec		__DRIextension;

-typedef struct __DRIcopySubBufferExtensionRec	__DRIcopySubBufferExtension;

-typedef struct __DRIswapControlExtensionRec	__DRIswapControlExtension;

-typedef struct __DRIframeTrackingExtensionRec	__DRIframeTrackingExtension;

-typedef struct __DRImediaStreamCounterExtensionRec	__DRImediaStreamCounterExtension;

-typedef struct __DRItexOffsetExtensionRec	__DRItexOffsetExtension;

-typedef struct __DRItexBufferExtensionRec	__DRItexBufferExtension;

-typedef struct __DRIlegacyExtensionRec		__DRIlegacyExtension;

-typedef struct __DRIswrastExtensionRec		__DRIswrastExtension;

-typedef struct __DRIbufferRec			__DRIbuffer;

-typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;

-typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;

-typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;

-

-/*@}*/

-

-

-/**

- * Extension struct.  Drivers 'inherit' from this struct by embedding

- * it as the first element in the extension struct.

- *

- * We never break API in for a DRI extension.  If we need to change

- * the way things work in a non-backwards compatible manner, we

- * introduce a new extension.  During a transition period, we can

- * leave both the old and the new extension in the driver, which

- * allows us to move to the new interface without having to update the

- * loader(s) in lock step.

- *

- * However, we can add entry points to an extension over time as long

- * as we don't break the old ones.  As we add entry points to an

- * extension, we increase the version number.  The corresponding

- * #define can be used to guard code that accesses the new entry

- * points at compile time and the version field in the extension

- * struct can be used at run-time to determine how to use the

- * extension.

- */

-struct __DRIextensionRec {

-    const char *name;

-    int version;

-};

-

-/**

- * The first set of extension are the screen extensions, returned by

- * __DRIcore::getExtensions().  This entry point will return a list of

- * extensions and the loader can use the ones it knows about by

- * casting them to more specific extensions and advertising any GLX

- * extensions the DRI extensions enables.

- */

-

-/**

- * Used by drivers to indicate support for setting the read drawable.

- */

-#define __DRI_READ_DRAWABLE "DRI_ReadDrawable"

-#define __DRI_READ_DRAWABLE_VERSION 1

-

-/**

- * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension.

- */

-#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer"

-#define __DRI_COPY_SUB_BUFFER_VERSION 1

-struct __DRIcopySubBufferExtensionRec {

-    __DRIextension base;

-    void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h);

-};

-

-/**

- * Used by drivers that implement the GLX_SGI_swap_control or

- * GLX_MESA_swap_control extension.

- */

-#define __DRI_SWAP_CONTROL "DRI_SwapControl"

-#define __DRI_SWAP_CONTROL_VERSION 1

-struct __DRIswapControlExtensionRec {

-    __DRIextension base;

-    void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval);

-    unsigned int (*getSwapInterval)(__DRIdrawable *drawable);

-};

-

-/**

- * Used by drivers that implement the GLX_MESA_swap_frame_usage extension.

- */

-#define __DRI_FRAME_TRACKING "DRI_FrameTracking"

-#define __DRI_FRAME_TRACKING_VERSION 1

-struct __DRIframeTrackingExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Enable or disable frame usage tracking.

-     * 

-     * \since Internal API version 20030317.

-     */

-    int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable);

-

-    /**

-     * Retrieve frame usage information.

-     * 

-     * \since Internal API version 20030317.

-     */

-    int (*queryFrameTracking)(__DRIdrawable *drawable,

-			      int64_t * sbc, int64_t * missedFrames,

-			      float * lastMissedUsage, float * usage);

-};

-

-

-/**

- * Used by drivers that implement the GLX_SGI_video_sync extension.

- */

-#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter"

-#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1

-struct __DRImediaStreamCounterExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Wait for the MSC to equal target_msc, or, if that has already passed,

-     * the next time (MSC % divisor) is equal to remainder.  If divisor is

-     * zero, the function will return as soon as MSC is greater than or equal

-     * to target_msc.

-     */

-    int (*waitForMSC)(__DRIdrawable *drawable,

-		      int64_t target_msc, int64_t divisor, int64_t remainder,

-		      int64_t * msc, int64_t * sbc);

-

-    /**

-     * Get the number of vertical refreshes since some point in time before

-     * this function was first called (i.e., system start up).

-     */

-    int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable,

-			  int64_t *msc);

-};

-

-

-#define __DRI_TEX_OFFSET "DRI_TexOffset"

-#define __DRI_TEX_OFFSET_VERSION 1

-struct __DRItexOffsetExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Method to override base texture image with a driver specific 'offset'.

-     * The depth passed in allows e.g. to ignore the alpha channel of texture

-     * images where the non-alpha components don't occupy a whole texel.

-     *

-     * For GLX_EXT_texture_from_pixmap with AIGLX.

-     */

-    void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname,

-			 unsigned long long offset, GLint depth, GLuint pitch);

-};

-

-

-/* Valid values for format in the setTexBuffer2 function below.  These

- * values match the GLX tokens for compatibility reasons, but we

- * define them here since the DRI interface can't depend on GLX. */

-#define __DRI_TEXTURE_FORMAT_NONE        0x20D8

-#define __DRI_TEXTURE_FORMAT_RGB         0x20D9

-#define __DRI_TEXTURE_FORMAT_RGBA        0x20DA

-

-#define __DRI_TEX_BUFFER "DRI_TexBuffer"

-#define __DRI_TEX_BUFFER_VERSION 2

-struct __DRItexBufferExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Method to override base texture image with the contents of a

-     * __DRIdrawable. 

-     *

-     * For GLX_EXT_texture_from_pixmap with AIGLX.  Deprecated in favor of

-     * setTexBuffer2 in version 2 of this interface

-     */

-    void (*setTexBuffer)(__DRIcontext *pDRICtx,

-			 GLint target,

-			 __DRIdrawable *pDraw);

-

-    /**

-     * Method to override base texture image with the contents of a

-     * __DRIdrawable, including the required texture format attribute.

-     *

-     * For GLX_EXT_texture_from_pixmap with AIGLX.

-     */

-    void (*setTexBuffer2)(__DRIcontext *pDRICtx,

-			  GLint target,

-			  GLint format,

-			  __DRIdrawable *pDraw);

-    /**

-     * Method to release texture buffer in case some special platform

-     * need this.

-     *

-     * For GLX_EXT_texture_from_pixmap with AIGLX.

-     */

-    void (*releaseTexBuffer)(__DRIcontext *pDRICtx,

-			GLint target,

-			__DRIdrawable *pDraw);

-};

-

-/**

- * Used by drivers that implement DRI2

- */

-#define __DRI2_FLUSH "DRI2_Flush"

-#define __DRI2_FLUSH_VERSION 3

-struct __DRI2flushExtensionRec {

-    __DRIextension base;

-    void (*flush)(__DRIdrawable *drawable);

-

-    /**

-     * Ask the driver to call getBuffers/getBuffersWithFormat before

-     * it starts rendering again.

-     *

-     * \param drawable the drawable to invalidate

-     *

-     * \since 3

-     */

-    void (*invalidate)(__DRIdrawable *drawable);

-};

-

-

-/**

- * XML document describing the configuration options supported by the

- * driver.

- */

-extern const char __driConfigOptions[];

-

-/*@}*/

-

-/**

- * The following extensions describe loader features that the DRI

- * driver can make use of.  Some of these are mandatory, such as the

- * getDrawableInfo extension for DRI and the DRI Loader extensions for

- * DRI2, while others are optional, and if present allow the driver to

- * expose certain features.  The loader pass in a NULL terminated

- * array of these extensions to the driver in the createNewScreen

- * constructor.

- */

-

-typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension;

-typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension;

-typedef struct __DRIdamageExtensionRec __DRIdamageExtension;

-typedef struct __DRIloaderExtensionRec __DRIloaderExtension;

-typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension;

-

-

-/**

- * Callback to getDrawableInfo protocol

- */

-#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo"

-#define __DRI_GET_DRAWABLE_INFO_VERSION 1

-struct __DRIgetDrawableInfoExtensionRec {

-    __DRIextension base;

-

-    /**

-     * This function is used to get information about the position, size, and

-     * clip rects of a drawable.

-     */

-    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,

-	unsigned int * index, unsigned int * stamp,

-        int * x, int * y, int * width, int * height,

-        int * numClipRects, drm_clip_rect_t ** pClipRects,

-        int * backX, int * backY,

-	int * numBackClipRects, drm_clip_rect_t ** pBackClipRects,

-	void *loaderPrivate);

-};

-

-typedef int int32_t;

-

-/**

- * Callback to get system time for media stream counter extensions.

- */

-#define __DRI_SYSTEM_TIME "DRI_SystemTime"

-#define __DRI_SYSTEM_TIME_VERSION 1

-struct __DRIsystemTimeExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Get the 64-bit unadjusted system time (UST).

-     */

-    int (*getUST)(int64_t * ust);

-

-    /**

-     * Get the media stream counter (MSC) rate.

-     * 

-     * Matching the definition in GLX_OML_sync_control, this function returns

-     * the rate of the "media stream counter".  In practical terms, this is

-     * the frame refresh rate of the display.

-     */

-    GLboolean (*getMSCRate)(__DRIdrawable *draw,

-			    int32_t * numerator, int32_t * denominator,

-			    void *loaderPrivate);

-};

-

-/**

- * Damage reporting

- */

-#define __DRI_DAMAGE "DRI_Damage"

-#define __DRI_DAMAGE_VERSION 1

-struct __DRIdamageExtensionRec {

-    __DRIextension base;

-

-    /**

-     * Reports areas of the given drawable which have been modified by the

-     * driver.

-     *

-     * \param drawable which the drawing was done to.

-     * \param rects rectangles affected, with the drawable origin as the

-     *	      origin.

-     * \param x X offset of the drawable within the screen (used in the

-     *	      front_buffer case)

-     * \param y Y offset of the drawable within the screen.

-     * \param front_buffer boolean flag for whether the drawing to the

-     * 	      drawable was actually done directly to the front buffer (instead

-     *	      of backing storage, for example)

-     * \param loaderPrivate the data passed in at createNewDrawable time

-     */

-    void (*reportDamage)(__DRIdrawable *draw,

-			 int x, int y,

-			 drm_clip_rect_t *rects, int num_rects,

-			 GLboolean front_buffer,

-			 void *loaderPrivate);

-};

-

-#define __DRI_SWRAST_IMAGE_OP_DRAW	1

-#define __DRI_SWRAST_IMAGE_OP_CLEAR	2

-#define __DRI_SWRAST_IMAGE_OP_SWAP	3

-

-/**

- * SWRast Loader extension.

- */

-#define __DRI_SWRAST_LOADER "DRI_SWRastLoader"

-#define __DRI_SWRAST_LOADER_VERSION 1

-struct __DRIswrastLoaderExtensionRec {

-    __DRIextension base;

-

-    /*

-     * Drawable position and size

-     */

-    void (*getDrawableInfo)(__DRIdrawable *drawable,

-			    int *x, int *y, int *width, int *height,

-			    void *loaderPrivate);

-

-    /**

-     * Put image to drawable

-     */

-    void (*putImage)(__DRIdrawable *drawable, int op,

-		     int x, int y, int width, int height,

-		     char *data, void *loaderPrivate);

-

-    /**

-     * Get image from readable

-     */

-    void (*getImage)(__DRIdrawable *readable,

-		     int x, int y, int width, int height,

-		     char *data, void *loaderPrivate);

-};

-

-/**

- * Invalidate loader extension.  The presence of this extension

- * indicates to the DRI driver that the loader will call invalidate in

- * the __DRI2_FLUSH extension, whenever the needs to query for new

- * buffers.  This means that the DRI driver can drop the polling in

- * glViewport().

- *

- * The extension doesn't provide any functionality, it's only use to

- * indicate to the driver that it can use the new semantics.  A DRI

- * driver can use this to switch between the different semantics or

- * just refuse to initialize if this extension isn't present.

- */

-#define __DRI_USE_INVALIDATE "DRI_UseInvalidate"

-#define __DRI_USE_INVALIDATE_VERSION 1

-

-typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension;

-struct __DRIuseInvalidateExtensionRec {

-   __DRIextension base;

-};

-

-/**

- * The remaining extensions describe driver extensions, immediately

- * available interfaces provided by the driver.  To start using the

- * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for

- * the extension you need in the array.

- */

-#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"

-

-/**

- * Tokens for __DRIconfig attribs.  A number of attributes defined by

- * GLX or EGL standards are not in the table, as they must be provided

- * by the loader.  For example, FBConfig ID or visual ID, drawable type.

- */

-

-#define __DRI_ATTRIB_BUFFER_SIZE		 1

-#define __DRI_ATTRIB_LEVEL			 2

-#define __DRI_ATTRIB_RED_SIZE			 3

-#define __DRI_ATTRIB_GREEN_SIZE			 4

-#define __DRI_ATTRIB_BLUE_SIZE			 5

-#define __DRI_ATTRIB_LUMINANCE_SIZE		 6

-#define __DRI_ATTRIB_ALPHA_SIZE			 7

-#define __DRI_ATTRIB_ALPHA_MASK_SIZE		 8

-#define __DRI_ATTRIB_DEPTH_SIZE			 9

-#define __DRI_ATTRIB_STENCIL_SIZE		10

-#define __DRI_ATTRIB_ACCUM_RED_SIZE		11

-#define __DRI_ATTRIB_ACCUM_GREEN_SIZE		12

-#define __DRI_ATTRIB_ACCUM_BLUE_SIZE		13

-#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE		14

-#define __DRI_ATTRIB_SAMPLE_BUFFERS		15

-#define __DRI_ATTRIB_SAMPLES			16

-#define __DRI_ATTRIB_RENDER_TYPE		17

-#define __DRI_ATTRIB_CONFIG_CAVEAT		18

-#define __DRI_ATTRIB_CONFORMANT			19

-#define __DRI_ATTRIB_DOUBLE_BUFFER		20

-#define __DRI_ATTRIB_STEREO			21

-#define __DRI_ATTRIB_AUX_BUFFERS		22

-#define __DRI_ATTRIB_TRANSPARENT_TYPE		23

-#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE	24

-#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE	25

-#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE	26

-#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE	27

-#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE	28

-#define __DRI_ATTRIB_FLOAT_MODE			29

-#define __DRI_ATTRIB_RED_MASK			30

-#define __DRI_ATTRIB_GREEN_MASK			31

-#define __DRI_ATTRIB_BLUE_MASK			32

-#define __DRI_ATTRIB_ALPHA_MASK			33

-#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH		34

-#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT		35

-#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS		36

-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH	37

-#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT	38

-#define __DRI_ATTRIB_VISUAL_SELECT_GROUP	39

-#define __DRI_ATTRIB_SWAP_METHOD		40

-#define __DRI_ATTRIB_MAX_SWAP_INTERVAL		41

-#define __DRI_ATTRIB_MIN_SWAP_INTERVAL		42

-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB	43

-#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA	44

-#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE	45

-#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46

-#define __DRI_ATTRIB_YINVERTED			47

-#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48

-

-/* __DRI_ATTRIB_RENDER_TYPE */

-#define __DRI_ATTRIB_RGBA_BIT			0x01	

-#define __DRI_ATTRIB_COLOR_INDEX_BIT		0x02

-#define __DRI_ATTRIB_LUMINANCE_BIT		0x04

-

-/* __DRI_ATTRIB_CONFIG_CAVEAT */

-#define __DRI_ATTRIB_SLOW_BIT			0x01

-#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG	0x02

-

-/* __DRI_ATTRIB_TRANSPARENT_TYPE */

-#define __DRI_ATTRIB_TRANSPARENT_RGB		0x00

-#define __DRI_ATTRIB_TRANSPARENT_INDEX		0x01

-

-/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	 */

-#define __DRI_ATTRIB_TEXTURE_1D_BIT		0x01

-#define __DRI_ATTRIB_TEXTURE_2D_BIT		0x02

-#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT	0x04

-

-/**

- * This extension defines the core DRI functionality.

- */

-#define __DRI_CORE "DRI_Core"

-#define __DRI_CORE_VERSION 1

-

-struct __DRIcoreExtensionRec {

-    __DRIextension base;

-

-    __DRIscreen *(*createNewScreen)(int screen, int fd,

-				    unsigned int sarea_handle,

-				    const __DRIextension **extensions,

-				    const __DRIconfig ***driverConfigs,

-				    void *loaderPrivate);

-

-    void (*destroyScreen)(__DRIscreen *screen);

-

-    const __DRIextension **(*getExtensions)(__DRIscreen *screen);

-

-    int (*getConfigAttrib)(const __DRIconfig *config,

-			   unsigned int attrib,

-			   unsigned int *value);

-

-    int (*indexConfigAttrib)(const __DRIconfig *config, int index,

-			     unsigned int *attrib, unsigned int *value);

-

-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

-					const __DRIconfig *config,

-					unsigned int drawable_id,

-					unsigned int head,

-					void *loaderPrivate);

-

-    void (*destroyDrawable)(__DRIdrawable *drawable);

-

-    void (*swapBuffers)(__DRIdrawable *drawable);

-

-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

-				      const __DRIconfig *config,

-				      __DRIcontext *shared,

-				      void *loaderPrivate);

-

-    int (*copyContext)(__DRIcontext *dest,

-		       __DRIcontext *src,

-		       unsigned long mask);

-

-    void (*destroyContext)(__DRIcontext *context);

-

-    int (*bindContext)(__DRIcontext *ctx,

-		       __DRIdrawable *pdraw,

-		       __DRIdrawable *pread);

-

-    int (*unbindContext)(__DRIcontext *ctx);

-};

-

-/**

- * Stored version of some component (i.e., server-side DRI module, kernel-side

- * DRM, etc.).

- * 

- * \todo

- * There are several data structures that explicitly store a major version,

- * minor version, and patch level.  These structures should be modified to

- * have a \c __DRIversionRec instead.

- */

-struct __DRIversionRec {

-    int    major;        /**< Major version number. */

-    int    minor;        /**< Minor version number. */

-    int    patch;        /**< Patch-level. */

-};

-

-/**

- * Framebuffer information record.  Used by libGL to communicate information

- * about the framebuffer to the driver's \c __driCreateNewScreen function.

- * 

- * In XFree86, most of this information is derrived from data returned by

- * calling \c XF86DRIGetDeviceInfo.

- *

- * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen

- *     __driUtilCreateNewScreen CallCreateNewScreen

- *

- * \bug This structure could be better named.

- */

-struct __DRIframebufferRec {

-    unsigned char *base;    /**< Framebuffer base address in the CPU's

-			     * address space.  This value is calculated by

-			     * calling \c drmMap on the framebuffer handle

-			     * returned by \c XF86DRIGetDeviceInfo (or a

-			     * similar function).

-			     */

-    int size;               /**< Framebuffer size, in bytes. */

-    int stride;             /**< Number of bytes from one line to the next. */

-    int width;              /**< Pixel width of the framebuffer. */

-    int height;             /**< Pixel height of the framebuffer. */

-    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */

-    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */

-};

-

-

-/**

- * This extension provides alternative screen, drawable and context

- * constructors for legacy DRI functionality.  This is used in

- * conjunction with the core extension.

- */

-#define __DRI_LEGACY "DRI_Legacy"

-#define __DRI_LEGACY_VERSION 1

-

-struct __DRIlegacyExtensionRec {

-    __DRIextension base;

-

-    __DRIscreen *(*createNewScreen)(int screen,

-				    const __DRIversion *ddx_version,

-				    const __DRIversion *dri_version,

-				    const __DRIversion *drm_version,

-				    const __DRIframebuffer *frame_buffer,

-				    void *pSAREA, int fd, 

-				    const __DRIextension **extensions,

-				    const __DRIconfig ***driver_configs,

-				    void *loaderPrivate);

-

-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

-					const __DRIconfig *config,

-					drm_drawable_t hwDrawable,

-					int renderType, const int *attrs,

-					void *loaderPrivate);

-

-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

-				      const __DRIconfig *config,

-				      int render_type,

-				      __DRIcontext *shared,

-				      drm_context_t hwContext,

-				      void *loaderPrivate);

-};

-

-/**

- * This extension provides alternative screen, drawable and context

- * constructors for swrast DRI functionality.  This is used in

- * conjunction with the core extension.

- */

-#define __DRI_SWRAST "DRI_SWRast"

-#define __DRI_SWRAST_VERSION 2

-

-struct __DRIswrastExtensionRec {

-    __DRIextension base;

-

-    __DRIscreen *(*createNewScreen)(int screen,

-				    const __DRIextension **extensions,

-				    const __DRIconfig ***driver_configs,

-				    void *loaderPrivate);

-

-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

-					const __DRIconfig *config,

-					void *loaderPrivate);

-

-   /* Since version 2 */

-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,

-                                           int api,

-                                           const __DRIconfig *config,

-                                           __DRIcontext *shared,

-                                           void *data);

-};

-

-/**

- * DRI2 Loader extension.

- */

-#define __DRI_BUFFER_FRONT_LEFT		0

-#define __DRI_BUFFER_BACK_LEFT		1

-#define __DRI_BUFFER_FRONT_RIGHT	2

-#define __DRI_BUFFER_BACK_RIGHT		3

-#define __DRI_BUFFER_DEPTH		4

-#define __DRI_BUFFER_STENCIL		5

-#define __DRI_BUFFER_ACCUM		6

-#define __DRI_BUFFER_FAKE_FRONT_LEFT	7

-#define __DRI_BUFFER_FAKE_FRONT_RIGHT	8

-#define __DRI_BUFFER_DEPTH_STENCIL	9  /**< Only available with DRI2 1.1 */

-#define __DRI_BUFFER_HIZ		10

-

-/* Inofficial and for internal use. Increase when adding a new buffer token. */

-#define __DRI_BUFFER_COUNT		11

-

-struct __DRIbufferRec {

-    unsigned int attachment;

-    unsigned int name;

-    unsigned int pitch;

-    unsigned int cpp;

-    unsigned int flags;

-};

-

-#define __DRI_DRI2_LOADER "DRI_DRI2Loader"

-#define __DRI_DRI2_LOADER_VERSION 3

-struct __DRIdri2LoaderExtensionRec {

-    __DRIextension base;

-

-    __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable,

-			       int *width, int *height,

-			       unsigned int *attachments, int count,

-			       int *out_count, void *loaderPrivate);

-

-    /**

-     * Flush pending front-buffer rendering

-     *

-     * Any rendering that has been performed to the

-     * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the

-     * \c __DRI_BUFFER_FRONT_LEFT.

-     *

-     * \param driDrawable    Drawable whose front-buffer is to be flushed

-     * \param loaderPrivate  Loader's private data that was previously passed

-     *                       into __DRIdri2ExtensionRec::createNewDrawable

-     */

-    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);

-

-

-    /**

-     * Get list of buffers from the server

-     *

-     * Gets a list of buffer for the specified set of attachments.  Unlike

-     * \c ::getBuffers, this function takes a list of attachments paired with

-     * opaque \c unsigned \c int value describing the format of the buffer.

-     * It is the responsibility of the caller to know what the service that

-     * allocates the buffers will expect to receive for the format.

-     *

-     * \param driDrawable    Drawable whose buffers are being queried.

-     * \param width          Output where the width of the buffers is stored.

-     * \param height         Output where the height of the buffers is stored.

-     * \param attachments    List of pairs of attachment ID and opaque format

-     *                       requested for the drawable.

-     * \param count          Number of attachment / format pairs stored in

-     *                       \c attachments.

-     * \param loaderPrivate  Loader's private data that was previously passed

-     *                       into __DRIdri2ExtensionRec::createNewDrawable.

-     */

-    __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable,

-					 int *width, int *height,

-					 unsigned int *attachments, int count,

-					 int *out_count, void *loaderPrivate);

-};

-

-/**

- * This extension provides alternative screen, drawable and context

- * constructors for DRI2.

- */

-#define __DRI_DRI2 "DRI_DRI2"

-#define __DRI_DRI2_VERSION 2

-

-#define __DRI_API_OPENGL	0

-#define __DRI_API_GLES		1

-#define __DRI_API_GLES2		2

-

-struct __DRIdri2ExtensionRec {

-    __DRIextension base;

-

-    __DRIscreen *(*createNewScreen)(int screen, int fd,

-				    const __DRIextension **extensions,

-				    const __DRIconfig ***driver_configs,

-				    void *loaderPrivate);

-

-    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,

-					const __DRIconfig *config,

-					void *loaderPrivate);

-

-    __DRIcontext *(*createNewContext)(__DRIscreen *screen,

-				      const __DRIconfig *config,

-				      __DRIcontext *shared,

-				      void *loaderPrivate);

-

-   /* Since version 2 */

-   unsigned int (*getAPIMask)(__DRIscreen *screen);

-

-   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,

-					   int api,

-					   const __DRIconfig *config,

-					   __DRIcontext *shared,

-					   void *data);

-

-   __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen,

-				  unsigned int attachment,

-				  unsigned int format,

-				  int width,

-				  int height);

-   void (*releaseBuffer)(__DRIscreen *screen,

-			 __DRIbuffer *buffer);

-};

-

-

-/**

- * This extension provides functionality to enable various EGLImage

- * extensions.

- */

-#define __DRI_IMAGE "DRI_IMAGE"

-#define __DRI_IMAGE_VERSION 1

-

-/**

- * These formats correspond to the similarly named MESA_FORMAT_*

- * tokens, except in the native endian of the CPU.  For example, on

- * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to

- * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian.

- */

-#define __DRI_IMAGE_FORMAT_RGB565       0x1001

-#define __DRI_IMAGE_FORMAT_XRGB8888     0x1002

-#define __DRI_IMAGE_FORMAT_ARGB8888     0x1003

-#define __DRI_IMAGE_FORMAT_ABGR8888     0x1004

-

-#define __DRI_IMAGE_USE_SHARE		0x0001

-#define __DRI_IMAGE_USE_SCANOUT		0x0002

-#define __DRI_IMAGE_USE_CURSOR		0x0004

-

-/**

- * queryImage attributes

- */

-

-#define __DRI_IMAGE_ATTRIB_STRIDE	0x2000

-#define __DRI_IMAGE_ATTRIB_HANDLE	0x2001

-#define __DRI_IMAGE_ATTRIB_NAME		0x2002

-

-typedef struct __DRIimageRec          __DRIimage;

-typedef struct __DRIimageExtensionRec __DRIimageExtension;

-struct __DRIimageExtensionRec {

-    __DRIextension base;

-

-    __DRIimage *(*createImageFromName)(__DRIscreen *screen,

-				       int width, int height, int format,

-				       int name, int pitch,

-				       void *loaderPrivate);

-

-    __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context,

-					       int renderbuffer,

-					       void *loaderPrivate);

-

-    void (*destroyImage)(__DRIimage *image);

-

-    __DRIimage *(*createImage)(__DRIscreen *screen,

-			       int width, int height, int format,

-			       unsigned int use,

-			       void *loaderPrivate);

-

-   GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);

-

-   /**

-    * The new __DRIimage will share the content with the old one, see dup(2).

-    */

-   __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate);

-};

-

-

-/**

- * This extension must be implemented by the loader and passed to the

- * driver at screen creation time.  The EGLImage entry points in the

- * various client APIs take opaque EGLImage handles and use this

- * extension to map them to a __DRIimage.  At version 1, this

- * extensions allows mapping EGLImage pointers to __DRIimage pointers,

- * but future versions could support other EGLImage-like, opaque types

- * with new lookup functions.

- */

-#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"

-#define __DRI_IMAGE_LOOKUP_VERSION 1

-

-typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;

-struct __DRIimageLookupExtensionRec {

-    __DRIextension base;

-

-    __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,

-				  void *loaderPrivate);

-};

-

-/**

- * This extension allows for common DRI2 options

- */

-#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY"

-#define __DRI2_CONFIG_QUERY_VERSION 1

-

-typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension;

-struct __DRI2configQueryExtensionRec {

-   __DRIextension base;

-

-   int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val);

-   int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val);

-   int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val);

-};

-#endif

+/*
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2007-2008 Red Hat, Inc.
+ * (C) Copyright IBM Corporation 2004
+ * 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"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file dri_interface.h
+ *
+ * This file contains all the types and functions that define the interface
+ * between a DRI driver and driver loader.  Currently, the most common driver
+ * loader is the XFree86 libGL.so.  However, other loaders do exist, and in
+ * the future the server-side libglx.a will also be a loader.
+ * 
+ * \author Kevin E. Martin <kevin@precisioninsight.com>
+ * \author Ian Romanick <idr@us.ibm.com>
+ * \author Kristian Høgsberg <krh@redhat.com>
+ */
+
+#ifndef DRI_INTERFACE_H
+#define DRI_INTERFACE_H
+
+/* For archs with no drm.h */
+#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(_MSC_VER)
+#ifndef __NOT_HAVE_DRM_H
+#define __NOT_HAVE_DRM_H
+#endif
+#endif
+
+#ifndef __NOT_HAVE_DRM_H
+#include <drm.h>
+#else
+typedef unsigned int drm_context_t;
+typedef unsigned int drm_drawable_t;
+typedef struct drm_clip_rect drm_clip_rect_t;
+#endif
+
+/**
+ * \name DRI interface structures
+ *
+ * The following structures define the interface between the GLX client
+ * side library and the DRI (direct rendering infrastructure).
+ */
+/*@{*/
+typedef struct __DRIdisplayRec		__DRIdisplay;
+typedef struct __DRIscreenRec		__DRIscreen;
+typedef struct __DRIcontextRec		__DRIcontext;
+typedef struct __DRIdrawableRec		__DRIdrawable;
+typedef struct __DRIconfigRec		__DRIconfig;
+typedef struct __DRIframebufferRec	__DRIframebuffer;
+typedef struct __DRIversionRec		__DRIversion;
+
+typedef struct __DRIcoreExtensionRec		__DRIcoreExtension;
+typedef struct __DRIextensionRec		__DRIextension;
+typedef struct __DRIcopySubBufferExtensionRec	__DRIcopySubBufferExtension;
+typedef struct __DRIswapControlExtensionRec	__DRIswapControlExtension;
+typedef struct __DRIframeTrackingExtensionRec	__DRIframeTrackingExtension;
+typedef struct __DRImediaStreamCounterExtensionRec	__DRImediaStreamCounterExtension;
+typedef struct __DRItexOffsetExtensionRec	__DRItexOffsetExtension;
+typedef struct __DRItexBufferExtensionRec	__DRItexBufferExtension;
+typedef struct __DRIlegacyExtensionRec		__DRIlegacyExtension;
+typedef struct __DRIswrastExtensionRec		__DRIswrastExtension;
+typedef struct __DRIbufferRec			__DRIbuffer;
+typedef struct __DRIdri2ExtensionRec		__DRIdri2Extension;
+typedef struct __DRIdri2LoaderExtensionRec	__DRIdri2LoaderExtension;
+typedef struct __DRI2flushExtensionRec	__DRI2flushExtension;
+
+/*@}*/
+
+
+/**
+ * Extension struct.  Drivers 'inherit' from this struct by embedding
+ * it as the first element in the extension struct.
+ *
+ * We never break API in for a DRI extension.  If we need to change
+ * the way things work in a non-backwards compatible manner, we
+ * introduce a new extension.  During a transition period, we can
+ * leave both the old and the new extension in the driver, which
+ * allows us to move to the new interface without having to update the
+ * loader(s) in lock step.
+ *
+ * However, we can add entry points to an extension over time as long
+ * as we don't break the old ones.  As we add entry points to an
+ * extension, we increase the version number.  The corresponding
+ * #define can be used to guard code that accesses the new entry
+ * points at compile time and the version field in the extension
+ * struct can be used at run-time to determine how to use the
+ * extension.
+ */
+struct __DRIextensionRec {
+    const char *name;
+    int version;
+};
+
+/**
+ * The first set of extension are the screen extensions, returned by
+ * __DRIcore::getExtensions().  This entry point will return a list of
+ * extensions and the loader can use the ones it knows about by
+ * casting them to more specific extensions and advertising any GLX
+ * extensions the DRI extensions enables.
+ */
+
+/**
+ * Used by drivers to indicate support for setting the read drawable.
+ */
+#define __DRI_READ_DRAWABLE "DRI_ReadDrawable"
+#define __DRI_READ_DRAWABLE_VERSION 1
+
+/**
+ * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension.
+ */
+#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer"
+#define __DRI_COPY_SUB_BUFFER_VERSION 1
+struct __DRIcopySubBufferExtensionRec {
+    __DRIextension base;
+    void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h);
+};
+
+/**
+ * Used by drivers that implement the GLX_SGI_swap_control or
+ * GLX_MESA_swap_control extension.
+ */
+#define __DRI_SWAP_CONTROL "DRI_SwapControl"
+#define __DRI_SWAP_CONTROL_VERSION 1
+struct __DRIswapControlExtensionRec {
+    __DRIextension base;
+    void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval);
+    unsigned int (*getSwapInterval)(__DRIdrawable *drawable);
+};
+
+/**
+ * Used by drivers that implement the GLX_MESA_swap_frame_usage extension.
+ */
+#define __DRI_FRAME_TRACKING "DRI_FrameTracking"
+#define __DRI_FRAME_TRACKING_VERSION 1
+struct __DRIframeTrackingExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Enable or disable frame usage tracking.
+     * 
+     * \since Internal API version 20030317.
+     */
+    int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable);
+
+    /**
+     * Retrieve frame usage information.
+     * 
+     * \since Internal API version 20030317.
+     */
+    int (*queryFrameTracking)(__DRIdrawable *drawable,
+			      int64_t * sbc, int64_t * missedFrames,
+			      float * lastMissedUsage, float * usage);
+};
+
+
+/**
+ * Used by drivers that implement the GLX_SGI_video_sync extension.
+ */
+#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter"
+#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1
+struct __DRImediaStreamCounterExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Wait for the MSC to equal target_msc, or, if that has already passed,
+     * the next time (MSC % divisor) is equal to remainder.  If divisor is
+     * zero, the function will return as soon as MSC is greater than or equal
+     * to target_msc.
+     */
+    int (*waitForMSC)(__DRIdrawable *drawable,
+		      int64_t target_msc, int64_t divisor, int64_t remainder,
+		      int64_t * msc, int64_t * sbc);
+
+    /**
+     * Get the number of vertical refreshes since some point in time before
+     * this function was first called (i.e., system start up).
+     */
+    int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable,
+			  int64_t *msc);
+};
+
+
+#define __DRI_TEX_OFFSET "DRI_TexOffset"
+#define __DRI_TEX_OFFSET_VERSION 1
+struct __DRItexOffsetExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Method to override base texture image with a driver specific 'offset'.
+     * The depth passed in allows e.g. to ignore the alpha channel of texture
+     * images where the non-alpha components don't occupy a whole texel.
+     *
+     * For GLX_EXT_texture_from_pixmap with AIGLX.
+     */
+    void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname,
+			 unsigned long long offset, GLint depth, GLuint pitch);
+};
+
+
+/* Valid values for format in the setTexBuffer2 function below.  These
+ * values match the GLX tokens for compatibility reasons, but we
+ * define them here since the DRI interface can't depend on GLX. */
+#define __DRI_TEXTURE_FORMAT_NONE        0x20D8
+#define __DRI_TEXTURE_FORMAT_RGB         0x20D9
+#define __DRI_TEXTURE_FORMAT_RGBA        0x20DA
+
+#define __DRI_TEX_BUFFER "DRI_TexBuffer"
+#define __DRI_TEX_BUFFER_VERSION 2
+struct __DRItexBufferExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Method to override base texture image with the contents of a
+     * __DRIdrawable. 
+     *
+     * For GLX_EXT_texture_from_pixmap with AIGLX.  Deprecated in favor of
+     * setTexBuffer2 in version 2 of this interface
+     */
+    void (*setTexBuffer)(__DRIcontext *pDRICtx,
+			 GLint target,
+			 __DRIdrawable *pDraw);
+
+    /**
+     * Method to override base texture image with the contents of a
+     * __DRIdrawable, including the required texture format attribute.
+     *
+     * For GLX_EXT_texture_from_pixmap with AIGLX.
+     */
+    void (*setTexBuffer2)(__DRIcontext *pDRICtx,
+			  GLint target,
+			  GLint format,
+			  __DRIdrawable *pDraw);
+    /**
+     * Method to release texture buffer in case some special platform
+     * need this.
+     *
+     * For GLX_EXT_texture_from_pixmap with AIGLX.
+     */
+    void (*releaseTexBuffer)(__DRIcontext *pDRICtx,
+			GLint target,
+			__DRIdrawable *pDraw);
+};
+
+/**
+ * Used by drivers that implement DRI2
+ */
+#define __DRI2_FLUSH "DRI2_Flush"
+#define __DRI2_FLUSH_VERSION 3
+struct __DRI2flushExtensionRec {
+    __DRIextension base;
+    void (*flush)(__DRIdrawable *drawable);
+
+    /**
+     * Ask the driver to call getBuffers/getBuffersWithFormat before
+     * it starts rendering again.
+     *
+     * \param drawable the drawable to invalidate
+     *
+     * \since 3
+     */
+    void (*invalidate)(__DRIdrawable *drawable);
+};
+
+
+/**
+ * XML document describing the configuration options supported by the
+ * driver.
+ */
+extern const char __driConfigOptions[];
+
+/*@}*/
+
+/**
+ * The following extensions describe loader features that the DRI
+ * driver can make use of.  Some of these are mandatory, such as the
+ * getDrawableInfo extension for DRI and the DRI Loader extensions for
+ * DRI2, while others are optional, and if present allow the driver to
+ * expose certain features.  The loader pass in a NULL terminated
+ * array of these extensions to the driver in the createNewScreen
+ * constructor.
+ */
+
+typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension;
+typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension;
+typedef struct __DRIdamageExtensionRec __DRIdamageExtension;
+typedef struct __DRIloaderExtensionRec __DRIloaderExtension;
+typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension;
+
+
+/**
+ * Callback to getDrawableInfo protocol
+ */
+#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo"
+#define __DRI_GET_DRAWABLE_INFO_VERSION 1
+struct __DRIgetDrawableInfoExtensionRec {
+    __DRIextension base;
+
+    /**
+     * This function is used to get information about the position, size, and
+     * clip rects of a drawable.
+     */
+    GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable,
+	unsigned int * index, unsigned int * stamp,
+        int * x, int * y, int * width, int * height,
+        int * numClipRects, drm_clip_rect_t ** pClipRects,
+        int * backX, int * backY,
+	int * numBackClipRects, drm_clip_rect_t ** pBackClipRects,
+	void *loaderPrivate);
+};
+
+typedef int int32_t;
+
+/**
+ * Callback to get system time for media stream counter extensions.
+ */
+#define __DRI_SYSTEM_TIME "DRI_SystemTime"
+#define __DRI_SYSTEM_TIME_VERSION 1
+struct __DRIsystemTimeExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Get the 64-bit unadjusted system time (UST).
+     */
+    int (*getUST)(int64_t * ust);
+
+    /**
+     * Get the media stream counter (MSC) rate.
+     * 
+     * Matching the definition in GLX_OML_sync_control, this function returns
+     * the rate of the "media stream counter".  In practical terms, this is
+     * the frame refresh rate of the display.
+     */
+    GLboolean (*getMSCRate)(__DRIdrawable *draw,
+			    int32_t * numerator, int32_t * denominator,
+			    void *loaderPrivate);
+};
+
+/**
+ * Damage reporting
+ */
+#define __DRI_DAMAGE "DRI_Damage"
+#define __DRI_DAMAGE_VERSION 1
+struct __DRIdamageExtensionRec {
+    __DRIextension base;
+
+    /**
+     * Reports areas of the given drawable which have been modified by the
+     * driver.
+     *
+     * \param drawable which the drawing was done to.
+     * \param rects rectangles affected, with the drawable origin as the
+     *	      origin.
+     * \param x X offset of the drawable within the screen (used in the
+     *	      front_buffer case)
+     * \param y Y offset of the drawable within the screen.
+     * \param front_buffer boolean flag for whether the drawing to the
+     * 	      drawable was actually done directly to the front buffer (instead
+     *	      of backing storage, for example)
+     * \param loaderPrivate the data passed in at createNewDrawable time
+     */
+    void (*reportDamage)(__DRIdrawable *draw,
+			 int x, int y,
+			 drm_clip_rect_t *rects, int num_rects,
+			 GLboolean front_buffer,
+			 void *loaderPrivate);
+};
+
+#define __DRI_SWRAST_IMAGE_OP_DRAW	1
+#define __DRI_SWRAST_IMAGE_OP_CLEAR	2
+#define __DRI_SWRAST_IMAGE_OP_SWAP	3
+
+/**
+ * SWRast Loader extension.
+ */
+#define __DRI_SWRAST_LOADER "DRI_SWRastLoader"
+#define __DRI_SWRAST_LOADER_VERSION 1
+struct __DRIswrastLoaderExtensionRec {
+    __DRIextension base;
+
+    /*
+     * Drawable position and size
+     */
+    void (*getDrawableInfo)(__DRIdrawable *drawable,
+			    int *x, int *y, int *width, int *height,
+			    void *loaderPrivate);
+
+    /**
+     * Put image to drawable
+     */
+    void (*putImage)(__DRIdrawable *drawable, int op,
+		     int x, int y, int width, int height,
+		     char *data, void *loaderPrivate);
+
+    /**
+     * Get image from readable
+     */
+    void (*getImage)(__DRIdrawable *readable,
+		     int x, int y, int width, int height,
+		     char *data, void *loaderPrivate);
+};
+
+/**
+ * Invalidate loader extension.  The presence of this extension
+ * indicates to the DRI driver that the loader will call invalidate in
+ * the __DRI2_FLUSH extension, whenever the needs to query for new
+ * buffers.  This means that the DRI driver can drop the polling in
+ * glViewport().
+ *
+ * The extension doesn't provide any functionality, it's only use to
+ * indicate to the driver that it can use the new semantics.  A DRI
+ * driver can use this to switch between the different semantics or
+ * just refuse to initialize if this extension isn't present.
+ */
+#define __DRI_USE_INVALIDATE "DRI_UseInvalidate"
+#define __DRI_USE_INVALIDATE_VERSION 1
+
+typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension;
+struct __DRIuseInvalidateExtensionRec {
+   __DRIextension base;
+};
+
+/**
+ * The remaining extensions describe driver extensions, immediately
+ * available interfaces provided by the driver.  To start using the
+ * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for
+ * the extension you need in the array.
+ */
+#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions"
+
+/**
+ * Tokens for __DRIconfig attribs.  A number of attributes defined by
+ * GLX or EGL standards are not in the table, as they must be provided
+ * by the loader.  For example, FBConfig ID or visual ID, drawable type.
+ */
+
+#define __DRI_ATTRIB_BUFFER_SIZE		 1
+#define __DRI_ATTRIB_LEVEL			 2
+#define __DRI_ATTRIB_RED_SIZE			 3
+#define __DRI_ATTRIB_GREEN_SIZE			 4
+#define __DRI_ATTRIB_BLUE_SIZE			 5
+#define __DRI_ATTRIB_LUMINANCE_SIZE		 6
+#define __DRI_ATTRIB_ALPHA_SIZE			 7
+#define __DRI_ATTRIB_ALPHA_MASK_SIZE		 8
+#define __DRI_ATTRIB_DEPTH_SIZE			 9
+#define __DRI_ATTRIB_STENCIL_SIZE		10
+#define __DRI_ATTRIB_ACCUM_RED_SIZE		11
+#define __DRI_ATTRIB_ACCUM_GREEN_SIZE		12
+#define __DRI_ATTRIB_ACCUM_BLUE_SIZE		13
+#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE		14
+#define __DRI_ATTRIB_SAMPLE_BUFFERS		15
+#define __DRI_ATTRIB_SAMPLES			16
+#define __DRI_ATTRIB_RENDER_TYPE		17
+#define __DRI_ATTRIB_CONFIG_CAVEAT		18
+#define __DRI_ATTRIB_CONFORMANT			19
+#define __DRI_ATTRIB_DOUBLE_BUFFER		20
+#define __DRI_ATTRIB_STEREO			21
+#define __DRI_ATTRIB_AUX_BUFFERS		22
+#define __DRI_ATTRIB_TRANSPARENT_TYPE		23
+#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE	24
+#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE	25
+#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE	26
+#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE	27
+#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE	28
+#define __DRI_ATTRIB_FLOAT_MODE			29
+#define __DRI_ATTRIB_RED_MASK			30
+#define __DRI_ATTRIB_GREEN_MASK			31
+#define __DRI_ATTRIB_BLUE_MASK			32
+#define __DRI_ATTRIB_ALPHA_MASK			33
+#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH		34
+#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT		35
+#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS		36
+#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH	37
+#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT	38
+#define __DRI_ATTRIB_VISUAL_SELECT_GROUP	39
+#define __DRI_ATTRIB_SWAP_METHOD		40
+#define __DRI_ATTRIB_MAX_SWAP_INTERVAL		41
+#define __DRI_ATTRIB_MIN_SWAP_INTERVAL		42
+#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB	43
+#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA	44
+#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE	45
+#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46
+#define __DRI_ATTRIB_YINVERTED			47
+#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48
+
+/* __DRI_ATTRIB_RENDER_TYPE */
+#define __DRI_ATTRIB_RGBA_BIT			0x01	
+#define __DRI_ATTRIB_COLOR_INDEX_BIT		0x02
+#define __DRI_ATTRIB_LUMINANCE_BIT		0x04
+
+/* __DRI_ATTRIB_CONFIG_CAVEAT */
+#define __DRI_ATTRIB_SLOW_BIT			0x01
+#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG	0x02
+
+/* __DRI_ATTRIB_TRANSPARENT_TYPE */
+#define __DRI_ATTRIB_TRANSPARENT_RGB		0x00
+#define __DRI_ATTRIB_TRANSPARENT_INDEX		0x01
+
+/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	 */
+#define __DRI_ATTRIB_TEXTURE_1D_BIT		0x01
+#define __DRI_ATTRIB_TEXTURE_2D_BIT		0x02
+#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT	0x04
+
+/**
+ * This extension defines the core DRI functionality.
+ */
+#define __DRI_CORE "DRI_Core"
+#define __DRI_CORE_VERSION 1
+
+struct __DRIcoreExtensionRec {
+    __DRIextension base;
+
+    __DRIscreen *(*createNewScreen)(int screen, int fd,
+				    unsigned int sarea_handle,
+				    const __DRIextension **extensions,
+				    const __DRIconfig ***driverConfigs,
+				    void *loaderPrivate);
+
+    void (*destroyScreen)(__DRIscreen *screen);
+
+    const __DRIextension **(*getExtensions)(__DRIscreen *screen);
+
+    int (*getConfigAttrib)(const __DRIconfig *config,
+			   unsigned int attrib,
+			   unsigned int *value);
+
+    int (*indexConfigAttrib)(const __DRIconfig *config, int index,
+			     unsigned int *attrib, unsigned int *value);
+
+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
+					const __DRIconfig *config,
+					unsigned int drawable_id,
+					unsigned int head,
+					void *loaderPrivate);
+
+    void (*destroyDrawable)(__DRIdrawable *drawable);
+
+    void (*swapBuffers)(__DRIdrawable *drawable);
+
+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
+				      const __DRIconfig *config,
+				      __DRIcontext *shared,
+				      void *loaderPrivate);
+
+    int (*copyContext)(__DRIcontext *dest,
+		       __DRIcontext *src,
+		       unsigned long mask);
+
+    void (*destroyContext)(__DRIcontext *context);
+
+    int (*bindContext)(__DRIcontext *ctx,
+		       __DRIdrawable *pdraw,
+		       __DRIdrawable *pread);
+
+    int (*unbindContext)(__DRIcontext *ctx);
+};
+
+/**
+ * Stored version of some component (i.e., server-side DRI module, kernel-side
+ * DRM, etc.).
+ * 
+ * \todo
+ * There are several data structures that explicitly store a major version,
+ * minor version, and patch level.  These structures should be modified to
+ * have a \c __DRIversionRec instead.
+ */
+struct __DRIversionRec {
+    int    major;        /**< Major version number. */
+    int    minor;        /**< Minor version number. */
+    int    patch;        /**< Patch-level. */
+};
+
+/**
+ * Framebuffer information record.  Used by libGL to communicate information
+ * about the framebuffer to the driver's \c __driCreateNewScreen function.
+ * 
+ * In XFree86, most of this information is derrived from data returned by
+ * calling \c XF86DRIGetDeviceInfo.
+ *
+ * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen
+ *     __driUtilCreateNewScreen CallCreateNewScreen
+ *
+ * \bug This structure could be better named.
+ */
+struct __DRIframebufferRec {
+    unsigned char *base;    /**< Framebuffer base address in the CPU's
+			     * address space.  This value is calculated by
+			     * calling \c drmMap on the framebuffer handle
+			     * returned by \c XF86DRIGetDeviceInfo (or a
+			     * similar function).
+			     */
+    int size;               /**< Framebuffer size, in bytes. */
+    int stride;             /**< Number of bytes from one line to the next. */
+    int width;              /**< Pixel width of the framebuffer. */
+    int height;             /**< Pixel height of the framebuffer. */
+    int dev_priv_size;      /**< Size of the driver's dev-priv structure. */
+    void *dev_priv;         /**< Pointer to the driver's dev-priv structure. */
+};
+
+
+/**
+ * This extension provides alternative screen, drawable and context
+ * constructors for legacy DRI functionality.  This is used in
+ * conjunction with the core extension.
+ */
+#define __DRI_LEGACY "DRI_Legacy"
+#define __DRI_LEGACY_VERSION 1
+
+struct __DRIlegacyExtensionRec {
+    __DRIextension base;
+
+    __DRIscreen *(*createNewScreen)(int screen,
+				    const __DRIversion *ddx_version,
+				    const __DRIversion *dri_version,
+				    const __DRIversion *drm_version,
+				    const __DRIframebuffer *frame_buffer,
+				    void *pSAREA, int fd, 
+				    const __DRIextension **extensions,
+				    const __DRIconfig ***driver_configs,
+				    void *loaderPrivate);
+
+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
+					const __DRIconfig *config,
+					drm_drawable_t hwDrawable,
+					int renderType, const int *attrs,
+					void *loaderPrivate);
+
+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
+				      const __DRIconfig *config,
+				      int render_type,
+				      __DRIcontext *shared,
+				      drm_context_t hwContext,
+				      void *loaderPrivate);
+};
+
+/**
+ * This extension provides alternative screen, drawable and context
+ * constructors for swrast DRI functionality.  This is used in
+ * conjunction with the core extension.
+ */
+#define __DRI_SWRAST "DRI_SWRast"
+#define __DRI_SWRAST_VERSION 2
+
+struct __DRIswrastExtensionRec {
+    __DRIextension base;
+
+    __DRIscreen *(*createNewScreen)(int screen,
+				    const __DRIextension **extensions,
+				    const __DRIconfig ***driver_configs,
+				    void *loaderPrivate);
+
+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
+					const __DRIconfig *config,
+					void *loaderPrivate);
+
+   /* Since version 2 */
+   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
+                                           int api,
+                                           const __DRIconfig *config,
+                                           __DRIcontext *shared,
+                                           void *data);
+};
+
+/**
+ * DRI2 Loader extension.
+ */
+#define __DRI_BUFFER_FRONT_LEFT		0
+#define __DRI_BUFFER_BACK_LEFT		1
+#define __DRI_BUFFER_FRONT_RIGHT	2
+#define __DRI_BUFFER_BACK_RIGHT		3
+#define __DRI_BUFFER_DEPTH		4
+#define __DRI_BUFFER_STENCIL		5
+#define __DRI_BUFFER_ACCUM		6
+#define __DRI_BUFFER_FAKE_FRONT_LEFT	7
+#define __DRI_BUFFER_FAKE_FRONT_RIGHT	8
+#define __DRI_BUFFER_DEPTH_STENCIL	9  /**< Only available with DRI2 1.1 */
+#define __DRI_BUFFER_HIZ		10
+
+/* Inofficial and for internal use. Increase when adding a new buffer token. */
+#define __DRI_BUFFER_COUNT		11
+
+struct __DRIbufferRec {
+    unsigned int attachment;
+    unsigned int name;
+    unsigned int pitch;
+    unsigned int cpp;
+    unsigned int flags;
+};
+
+#define __DRI_DRI2_LOADER "DRI_DRI2Loader"
+#define __DRI_DRI2_LOADER_VERSION 3
+struct __DRIdri2LoaderExtensionRec {
+    __DRIextension base;
+
+    __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable,
+			       int *width, int *height,
+			       unsigned int *attachments, int count,
+			       int *out_count, void *loaderPrivate);
+
+    /**
+     * Flush pending front-buffer rendering
+     *
+     * Any rendering that has been performed to the
+     * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the
+     * \c __DRI_BUFFER_FRONT_LEFT.
+     *
+     * \param driDrawable    Drawable whose front-buffer is to be flushed
+     * \param loaderPrivate  Loader's private data that was previously passed
+     *                       into __DRIdri2ExtensionRec::createNewDrawable
+     */
+    void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate);
+
+
+    /**
+     * Get list of buffers from the server
+     *
+     * Gets a list of buffer for the specified set of attachments.  Unlike
+     * \c ::getBuffers, this function takes a list of attachments paired with
+     * opaque \c unsigned \c int value describing the format of the buffer.
+     * It is the responsibility of the caller to know what the service that
+     * allocates the buffers will expect to receive for the format.
+     *
+     * \param driDrawable    Drawable whose buffers are being queried.
+     * \param width          Output where the width of the buffers is stored.
+     * \param height         Output where the height of the buffers is stored.
+     * \param attachments    List of pairs of attachment ID and opaque format
+     *                       requested for the drawable.
+     * \param count          Number of attachment / format pairs stored in
+     *                       \c attachments.
+     * \param loaderPrivate  Loader's private data that was previously passed
+     *                       into __DRIdri2ExtensionRec::createNewDrawable.
+     */
+    __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable,
+					 int *width, int *height,
+					 unsigned int *attachments, int count,
+					 int *out_count, void *loaderPrivate);
+};
+
+/**
+ * This extension provides alternative screen, drawable and context
+ * constructors for DRI2.
+ */
+#define __DRI_DRI2 "DRI_DRI2"
+#define __DRI_DRI2_VERSION 2
+
+#define __DRI_API_OPENGL	0
+#define __DRI_API_GLES		1
+#define __DRI_API_GLES2		2
+
+struct __DRIdri2ExtensionRec {
+    __DRIextension base;
+
+    __DRIscreen *(*createNewScreen)(int screen, int fd,
+				    const __DRIextension **extensions,
+				    const __DRIconfig ***driver_configs,
+				    void *loaderPrivate);
+
+    __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen,
+					const __DRIconfig *config,
+					void *loaderPrivate);
+
+    __DRIcontext *(*createNewContext)(__DRIscreen *screen,
+				      const __DRIconfig *config,
+				      __DRIcontext *shared,
+				      void *loaderPrivate);
+
+   /* Since version 2 */
+   unsigned int (*getAPIMask)(__DRIscreen *screen);
+
+   __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen,
+					   int api,
+					   const __DRIconfig *config,
+					   __DRIcontext *shared,
+					   void *data);
+
+   __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen,
+				  unsigned int attachment,
+				  unsigned int format,
+				  int width,
+				  int height);
+   void (*releaseBuffer)(__DRIscreen *screen,
+			 __DRIbuffer *buffer);
+};
+
+
+/**
+ * This extension provides functionality to enable various EGLImage
+ * extensions.
+ */
+#define __DRI_IMAGE "DRI_IMAGE"
+#define __DRI_IMAGE_VERSION 1
+
+/**
+ * These formats correspond to the similarly named MESA_FORMAT_*
+ * tokens, except in the native endian of the CPU.  For example, on
+ * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to
+ * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian.
+ */
+#define __DRI_IMAGE_FORMAT_RGB565       0x1001
+#define __DRI_IMAGE_FORMAT_XRGB8888     0x1002
+#define __DRI_IMAGE_FORMAT_ARGB8888     0x1003
+#define __DRI_IMAGE_FORMAT_ABGR8888     0x1004
+
+#define __DRI_IMAGE_USE_SHARE		0x0001
+#define __DRI_IMAGE_USE_SCANOUT		0x0002
+#define __DRI_IMAGE_USE_CURSOR		0x0004
+
+/**
+ * queryImage attributes
+ */
+
+#define __DRI_IMAGE_ATTRIB_STRIDE	0x2000
+#define __DRI_IMAGE_ATTRIB_HANDLE	0x2001
+#define __DRI_IMAGE_ATTRIB_NAME		0x2002
+
+typedef struct __DRIimageRec          __DRIimage;
+typedef struct __DRIimageExtensionRec __DRIimageExtension;
+struct __DRIimageExtensionRec {
+    __DRIextension base;
+
+    __DRIimage *(*createImageFromName)(__DRIscreen *screen,
+				       int width, int height, int format,
+				       int name, int pitch,
+				       void *loaderPrivate);
+
+    __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context,
+					       int renderbuffer,
+					       void *loaderPrivate);
+
+    void (*destroyImage)(__DRIimage *image);
+
+    __DRIimage *(*createImage)(__DRIscreen *screen,
+			       int width, int height, int format,
+			       unsigned int use,
+			       void *loaderPrivate);
+
+   GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value);
+
+   /**
+    * The new __DRIimage will share the content with the old one, see dup(2).
+    */
+   __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate);
+};
+
+
+/**
+ * This extension must be implemented by the loader and passed to the
+ * driver at screen creation time.  The EGLImage entry points in the
+ * various client APIs take opaque EGLImage handles and use this
+ * extension to map them to a __DRIimage.  At version 1, this
+ * extensions allows mapping EGLImage pointers to __DRIimage pointers,
+ * but future versions could support other EGLImage-like, opaque types
+ * with new lookup functions.
+ */
+#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP"
+#define __DRI_IMAGE_LOOKUP_VERSION 1
+
+typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension;
+struct __DRIimageLookupExtensionRec {
+    __DRIextension base;
+
+    __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image,
+				  void *loaderPrivate);
+};
+
+/**
+ * This extension allows for common DRI2 options
+ */
+#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY"
+#define __DRI2_CONFIG_QUERY_VERSION 1
+
+typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension;
+struct __DRI2configQueryExtensionRec {
+   __DRIextension base;
+
+   int (*configQueryb)(__DRIscreen *screen, const char *var, GLboolean *val);
+   int (*configQueryi)(__DRIscreen *screen, const char *var, GLint *val);
+   int (*configQueryf)(__DRIscreen *screen, const char *var, GLfloat *val);
+};
+#endif