Updated mesa project and synchronised files

1 files changed, 66 insertions, 55 deletions

diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index ab3be98a3..68c3ec956 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -1032,61 +1032,72 @@ struct _glapi_table
    void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 988 */

    void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 989 */

    void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 990 */

-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 991 */

-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 992 */

-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 993 */

-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 994 */

-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 995 */

-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 996 */

-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 997 */

-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 998 */

-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 999 */

-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1000 */

-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1001 */

-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1002 */

-   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1003 */

-   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1004 */

-   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1005 */

-   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1006 */

-   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1007 */

-   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1008 */

-   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1009 */

-   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1010 */

-   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1011 */

-   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1012 */

-   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1013 */

-   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1014 */

-   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1015 */

-   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1016 */

-   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1017 */

-   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1018 */

-   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1019 */

-   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1020 */

-   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1021 */

-   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1022 */

-   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1023 */

-   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1024 */

-   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1025 */

-   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1026 */

-   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1027 */

-   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1028 */

-   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1029 */

-   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1030 */

-   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1031 */

-   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1032 */

-   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1033 */

-   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1034 */

-   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1035 */

-   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1036 */

-   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1037 */

-   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1038 */

-   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1039 */

-   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1040 */

-   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1041 */

-   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1042 */

-   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1043 */

-   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1044 */

-   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1045 */

+   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 991 */

+   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 992 */

+   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 993 */

+   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 994 */

+   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 995 */

+   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 996 */

+   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 997 */

+   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 998 */

+   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 999 */

+   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1000 */

+   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1001 */

+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1002 */

+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1003 */

+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1004 */

+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1005 */

+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1006 */

+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1007 */

+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1008 */

+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1009 */

+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1010 */

+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1011 */

+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1012 */

+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1013 */

+   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1014 */

+   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1015 */

+   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1016 */

+   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1017 */

+   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1018 */

+   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1019 */

+   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1020 */

+   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1021 */

+   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1022 */

+   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1023 */

+   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1024 */

+   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1025 */

+   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1026 */

+   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1027 */

+   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1028 */

+   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1029 */

+   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1030 */

+   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1031 */

+   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1032 */

+   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1033 */

+   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1034 */

+   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1035 */

+   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1036 */

+   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1037 */

+   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1038 */

+   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1039 */

+   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1040 */

+   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1041 */

+   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1042 */

+   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1043 */

+   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1044 */

+   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1045 */

+   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1046 */

+   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1047 */

+   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1048 */

+   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1049 */

+   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1050 */

+   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1051 */

+   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1052 */

+   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1053 */

+   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1054 */

+   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1055 */

+   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1056 */

 #endif /* !defined HAVE_SHARED_GLAPI */

 };