diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:45:03 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:47:48 +0100 |
| commit | c84235ee0d9940e6a779ec306e615603b58a79f2 (patch) | |
| tree | 09c502e8f6d87fe6b21221b147f91342c7715920 /gl | |
| parent | e36b40e32ca6257b6d1bceb44bb18f739d508f28 (diff) | |
| download | vcxsrv-c84235ee0d9940e6a779ec306e615603b58a79f2.tar.gz vcxsrv-c84235ee0d9940e6a779ec306e615603b58a79f2.tar.bz2 vcxsrv-c84235ee0d9940e6a779ec306e615603b58a79f2.zip | |
Synchronised files with mesa
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/glext.h | 4 | ||||
| -rw-r--r-- | gl/internal/dri_interface.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gl/glext.h b/gl/glext.h index 09400215b..113241e77 100644 --- a/gl/glext.h +++ b/gl/glext.h @@ -7573,12 +7573,12 @@ typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam); +GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, GLvoid *userParam); GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam); +typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, GLvoid *userParam); typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); #endif diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h index b4eae98ba..af3a42ad7 100644 --- a/gl/internal/dri_interface.h +++ b/gl/internal/dri_interface.h @@ -898,7 +898,7 @@ struct __DRIdri2ExtensionRec { * extensions. */ #define __DRI_IMAGE "DRI_IMAGE" -#define __DRI_IMAGE_VERSION 2 +#define __DRI_IMAGE_VERSION 3 /** * These formats correspond to the similarly named MESA_FORMAT_* @@ -922,6 +922,7 @@ struct __DRIdri2ExtensionRec { #define __DRI_IMAGE_ATTRIB_STRIDE 0x2000 #define __DRI_IMAGE_ATTRIB_HANDLE 0x2001 #define __DRI_IMAGE_ATTRIB_NAME 0x2002 +#define __DRI_IMAGE_ATTRIB_FORMAT 0x2003 /* available in versions 3+ */ typedef struct __DRIimageRec __DRIimage; typedef struct __DRIimageExtensionRec __DRIimageExtension; |