From c70788421a8aae8fd8883aaa36c1ac9e2b1ee02d Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 5 Sep 2013 07:56:59 +0200 Subject: Updated to latest opengl specs --- xorg-server/hw/xwin/glx/gl.xml | 106 +++++++++++++++++++++++---------------- xorg-server/hw/xwin/glx/wgl.xml | 10 ++++ xorg-server/hw/xwin/glx/wglext.h | 10 +++- 3 files changed, 81 insertions(+), 45 deletions(-) (limited to 'xorg-server/hw') diff --git a/xorg-server/hw/xwin/glx/gl.xml b/xorg-server/hw/xwin/glx/gl.xml index c33041fe3..8844e8a6a 100644 --- a/xorg-server/hw/xwin/glx/gl.xml +++ b/xorg-server/hw/xwin/glx/gl.xml @@ -12701,7 +12701,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLint *size GLenum *type - GLchar *name + GLchar *name void glGetActiveAttribARB @@ -12711,7 +12711,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLint *size GLenum *type - GLcharARB *name + GLcharARB *name @@ -12748,7 +12748,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLint *size GLenum *type - GLchar *name + GLchar *name void glGetActiveUniformARB @@ -12758,7 +12758,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLint *size GLenum *type - GLcharARB *name + GLcharARB *name @@ -13136,13 +13136,13 @@ typedef unsigned int GLhandleARB; GLuint glGetDebugMessageLog GLuint count - GLsizei bufsize - GLenum *sources - GLenum *types - GLuint *ids - GLenum *severities - GLsizei *lengths - GLchar *messageLog + GLsizei bufSize + GLenum *sources + GLenum *types + GLuint *ids + GLenum *severities + GLsizei *lengths + GLchar *messageLog GLuint glGetDebugMessageLogAMD @@ -13157,25 +13157,25 @@ typedef unsigned int GLhandleARB; GLuint glGetDebugMessageLogARB GLuint count - GLsizei bufsize + GLsizei bufSize GLenum *sources GLenum *types GLuint *ids GLenum *severities GLsizei *lengths - GLchar *messageLog + GLchar *messageLog GLuint glGetDebugMessageLogKHR GLuint count - GLsizei bufsize - GLenum *sources - GLenum *types - GLuint *ids - GLenum *severities - GLsizei *lengths - GLchar *messageLog + GLsizei bufSize + GLenum *sources + GLenum *types + GLuint *ids + GLenum *severities + GLsizei *lengths + GLchar *messageLog @@ -13215,13 +13215,13 @@ typedef unsigned int GLhandleARB; GLuint driverControl GLsizei bufSize GLsizei *length - GLchar *driverControlString + GLchar *driverControlString void glGetDriverControlsQCOM GLint *num GLsizei size - GLuint *driverControls + GLuint *driverControls GLenum glGetError @@ -13460,7 +13460,7 @@ typedef unsigned int GLhandleARB; GLhandleARB obj GLsizei maxLength GLsizei *length - GLcharARB *infoLog + GLcharARB *infoLog GLint glGetInstrumentsSGIX @@ -13996,7 +13996,7 @@ typedef unsigned int GLhandleARB; GLuint object GLsizei bufSize GLsizei *length - GLchar *label + GLchar *label void glGetObjectLabelKHR @@ -14004,7 +14004,7 @@ typedef unsigned int GLhandleARB; GLuint name GLsizei bufSize GLsizei *length - GLchar *label + GLchar *label @@ -14038,7 +14038,7 @@ typedef unsigned int GLhandleARB; const void *ptr GLsizei bufSize GLsizei *length - GLchar *label + GLchar *label @@ -14277,7 +14277,7 @@ typedef unsigned int GLhandleARB; GLsizei bufSize GLsizei *length GLenum *binaryFormat - GLvoid *binary + GLvoid *binary void glGetProgramBinaryOES @@ -14285,7 +14285,7 @@ typedef unsigned int GLhandleARB; GLsizei bufSize GLsizei *length GLenum *binaryFormat - GLvoid *binary + GLvoid *binary void glGetProgramEnvParameterIivNV @@ -14316,7 +14316,7 @@ typedef unsigned int GLhandleARB; GLuint program GLsizei bufSize GLsizei *length - GLchar *infoLog + GLchar *infoLog @@ -14387,14 +14387,14 @@ typedef unsigned int GLhandleARB; GLuint pipeline GLsizei bufSize GLsizei *length - GLchar *infoLog + GLchar *infoLog void glGetProgramPipelineInfoLogEXT GLuint pipeline GLsizei bufSize GLsizei *length - GLchar *infoLog + GLchar *infoLog void glGetProgramPipelineiv @@ -14659,7 +14659,7 @@ typedef unsigned int GLhandleARB; GLuint shader GLsizei bufSize GLsizei *length - GLchar *infoLog + GLchar *infoLog @@ -14674,14 +14674,14 @@ typedef unsigned int GLhandleARB; GLuint shader GLsizei bufSize GLsizei *length - GLchar *source + GLchar *source void glGetShaderSourceARB GLhandleARB obj GLsizei maxLength GLsizei *length - GLcharARB *source + GLcharARB *source @@ -14725,7 +14725,7 @@ typedef unsigned int GLhandleARB; GLenum pname GLsizei bufSize GLsizei *length - GLint *values + GLint *values void glGetSyncivAPPLE @@ -14733,7 +14733,7 @@ typedef unsigned int GLhandleARB; GLenum pname GLsizei bufSize GLsizei *length - GLint *values + GLint *values void glGetTexBumpParameterfvATI @@ -14997,7 +14997,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLsizei *size GLenum *type - GLchar *name + GLchar *name void glGetTransformFeedbackVaryingEXT @@ -15007,7 +15007,7 @@ typedef unsigned int GLhandleARB; GLsizei *length GLsizei *size GLenum *type - GLchar *name + GLchar *name @@ -15520,7 +15520,7 @@ typedef unsigned int GLhandleARB; GLuint program GLint location GLsizei bufSize - GLfloat *params + GLfloat *params void glGetnUniformivARB @@ -15534,7 +15534,7 @@ typedef unsigned int GLhandleARB; GLuint program GLint location GLsizei bufSize - GLint *params + GLint *params void glGetnUniformuivARB @@ -20541,7 +20541,7 @@ typedef unsigned int GLhandleARB; GLenum format GLenum type GLsizei bufSize - GLvoid *data + GLvoid *data void glRectd @@ -22970,7 +22970,6 @@ typedef unsigned int GLhandleARB; void glTexturePageCommitmentEXT GLuint texture - GLenum target GLint level GLint xoffset GLint yoffset @@ -23975,7 +23974,7 @@ typedef unsigned int GLhandleARB; GLenum pname GLsizei bufSize GLsizei *length - GLint *values + GLint *values void glVDPAUInitNV @@ -24422,6 +24421,12 @@ typedef unsigned int GLhandleARB; GLuint attribindex GLuint bindingindex + + void glVertexArrayVertexAttribDivisorEXT + GLuint vaobj + GLuint index + GLuint divisor + void glVertexArrayVertexAttribFormatEXT GLuint vaobj @@ -35963,6 +35968,9 @@ typedef unsigned int GLhandleARB; + + + @@ -36016,6 +36024,9 @@ typedef unsigned int GLhandleARB; + + + @@ -36594,6 +36605,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -37086,7 +37102,7 @@ typedef unsigned int GLhandleARB; - + @@ -37157,6 +37173,8 @@ typedef unsigned int GLhandleARB; + + diff --git a/xorg-server/hw/xwin/glx/wgl.xml b/xorg-server/hw/xwin/glx/wgl.xml index 1758dcb71..8e0315308 100644 --- a/xorg-server/hw/xwin/glx/wgl.xml +++ b/xorg-server/hw/xwin/glx/wgl.xml @@ -660,6 +660,11 @@ int iHeight const int *piAttribList + + BOOL wglDelayBeforeSwapNV + HDC hDC + GLfloat seconds + BOOL wglDeleteAssociatedContextAMD HGLRC hglrc @@ -1943,5 +1948,10 @@ + + + + + diff --git a/xorg-server/hw/xwin/glx/wglext.h b/xorg-server/hw/xwin/glx/wglext.h index c23568570..0bb4b0819 100644 --- a/xorg-server/hw/xwin/glx/wglext.h +++ b/xorg-server/hw/xwin/glx/wglext.h @@ -41,7 +41,7 @@ extern "C" { #include #endif -#define WGL_WGLEXT_VERSION 20130710 +#define WGL_WGLEXT_VERSION 20130819 /* Generated C header for: * API: wgl @@ -645,6 +645,14 @@ BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarge #endif #endif /* WGL_NV_copy_image */ +#ifndef WGL_NV_delay_before_swap +#define WGL_NV_delay_before_swap 1 +typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds); +#ifdef WGL_WGLEXT_PROTOTYPES +BOOL WINAPI wglDelayBeforeSwapNV (HDC hDC, GLfloat seconds); +#endif +#endif /* WGL_NV_delay_before_swap */ + #ifndef WGL_NV_float_buffer #define WGL_NV_float_buffer 1 #define WGL_FLOAT_COMPONENTS_NV 0x20B0 -- cgit v1.2.3