packages: Mesa/Mesa-git.patch, Mesa/Mesa.spec - rel 3; more git fixes
arekm
arekm at pld-linux.org
Wed Nov 4 12:03:49 CET 2009
Author: arekm Date: Wed Nov 4 11:03:49 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; more git fixes
---- Files affected:
packages/Mesa:
Mesa-git.patch (1.5 -> 1.6) , Mesa.spec (1.224 -> 1.225)
---- Diffs:
================================================================
Index: packages/Mesa/Mesa-git.patch
diff -u packages/Mesa/Mesa-git.patch:1.5 packages/Mesa/Mesa-git.patch:1.6
--- packages/Mesa/Mesa-git.patch:1.5 Thu Oct 8 20:30:07 2009
+++ packages/Mesa/Mesa-git.patch Wed Nov 4 12:03:43 2009
@@ -1,3 +1,178 @@
+diff --git a/configs/autoconf.in b/configs/autoconf.in
+index 83737e3..a7f3c9d 100644
+--- a/configs/autoconf.in
++++ b/configs/autoconf.in
+@@ -124,7 +124,7 @@ INSTALL_INC_DIR = $(includedir)
+ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
+
+ # Where libGL will look for DRI hardware drivers
+-DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
++DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
+
+ # Xorg driver install directory (for xorg state-tracker)
+ XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
+diff --git a/configure.ac b/configure.ac
+index 7518976..5d11cf8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,6 +230,8 @@ else
+ LIB_EXTENSION='dylib' ;;
+ cygwin* )
+ LIB_EXTENSION='dll' ;;
++ aix* )
++ LIB_EXTENSION='a' ;;
+ * )
+ LIB_EXTENSION='so' ;;
+ esac
+@@ -647,6 +649,13 @@ AC_ARG_WITH([dri-driverdir],
+ [DRI_DRIVER_INSTALL_DIR="$withval"],
+ [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
+ AC_SUBST([DRI_DRIVER_INSTALL_DIR])
++dnl Extra search path for DRI drivers
++AC_ARG_WITH([dri-searchpath],
++ [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
++ [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
++ [DRI_DRIVER_SEARCH_DIR="$withval"],
++ [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
++AC_SUBST([DRI_DRIVER_SEARCH_DIR])
+ dnl Direct rendering or just indirect rendering
+ AC_ARG_ENABLE([driglx-direct],
+ [AS_HELP_STRING([--disable-driglx-direct],
+diff --git a/docs/news.html b/docs/news.html
+index 07ad42e..93da56a 100644
+--- a/docs/news.html
++++ b/docs/news.html
+@@ -10,6 +10,17 @@
+
+ <H1>News</H1>
+
++<h2>September 28, 2009</h2>
++<p>
++<a href="relnotes-7.6.html">Mesa 7.6</a> is released. This is a new feature
++release. Those especially concerned about stability may want to wait for the
++follow-on 7.6.1 bug-fix release.
++</p>
++<p>
++<a href="relnotes-7.5.2.html">Mesa 7.5.2</a> is also released.
++This is a stable release fixing bugs since the 7.5.1 release.
++</p>
++
+
+ <h2>September 3, 2009</h2>
+ <p>
+diff --git a/docs/relnotes-7.5.2.html b/docs/relnotes-7.5.2.html
+index 0832e11..5c395d9 100644
+--- a/docs/relnotes-7.5.2.html
++++ b/docs/relnotes-7.5.2.html
+@@ -8,7 +8,7 @@
+
+ <body bgcolor="#eeeeee">
+
+-<H1>Mesa 7.5.2 Release Notes, (date tbd)</H1>
++<H1>Mesa 7.5.2 Release Notes, 28 September 2009</H1>
+
+ <p>
+ Mesa 7.5.2 is a bug-fix release fixing issues found since the 7.5.1 release.
+@@ -31,7 +31,15 @@ for DRI hardware acceleration.
+
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++43a90191dd9f76cd65dcc1ac91f3be70 MesaLib-7.5.2.tar.gz
++94e47a499f1226803869c2e37a6a8e3a MesaLib-7.5.2.tar.bz2
++1ecb822b567ad67a0617361d45206b67 MesaLib-7.5.2.zip
++2718fdce7e075911d6147beb8f27104b MesaDemos-7.5.2.tar.gz
++4e0f5ccd58afe21eddcd94327d926e86 MesaDemos-7.5.2.tar.bz2
++f621f8c223b278d7c8e49a012d56ca25 MesaDemos-7.5.2.zip
++83c16c1d6bcfcc3f97aab5d2fe430b4c MesaGLUT-7.5.2.tar.gz
++e5d03bedae369ea3705783573bb33813 MesaGLUT-7.5.2.tar.bz2
++e82ba28e00d653e6f437d32be8ca8481 MesaGLUT-7.5.2.zip
+ </pre>
+
+
+@@ -55,6 +63,5 @@ tbd
+ when using Gallium.
+ </ul>
+
+-
+ </body>
+ </html>
+diff --git a/docs/relnotes-7.6.1.html b/docs/relnotes-7.6.1.html
+new file mode 100644
+index 0000000..9ee6bab
+--- /dev/null
++++ b/docs/relnotes-7.6.1.html
+@@ -0,0 +1,58 @@
++<HTML>
++
++<TITLE>Mesa Release Notes</TITLE>
++
++<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
++
++<BODY>
++
++<body bgcolor="#eeeeee">
++
++<H1>Mesa 7.6.1 Release Notes, (date tbd)</H1>
++
++<p>
++Mesa 7.6.1 is a bug-fix release fixing issues since version 7.6.
++</p>
++<p>
++Mesa 7.6.1 implements the OpenGL 2.1 API, but the version reported by
++glGetString(GL_VERSION) depends on the particular driver being used.
++Some drivers don't support all the features required in OpenGL 2.1.
++</p>
++<p>
++See the <a href="install.html">Compiling/Installing page</a> for prerequisites
++for DRI hardware acceleration.
++</p>
++
++
++<h2>MD5 checksums</h2>
++<pre>
++tbd
++</pre>
++
++
++<h2>New features</h2>
++<ul>
++<li>Upgraded GL/glext.h to version 56, GL/glxext.h to version 25,
++ GL/wglext.h to version 17
++</ul>
++
++
++<h2>Bug fixes</h2>
++<ul>
++<li>Fixed crash caused by glXCopyContext() and glXDestroyContext(), bug 24217
++<li>glXQueryContext(GLX_RENDER_TYPE) returned wrong values (bug 24211)
++<li>GLSL sqrt(0) returned unpredictable results
++<li>Fixed default texture binding bug when a bound texture was deleted.
++<li>r300: Work around an issue with very large fragment programs on R500.
++<li>Fake glXQueryDrawable() didn't return good values (bug 24320)
++<li>Fixed AUX buffer breakage (bug 24426).
++<li>Fixed locale-dependent float parsing bug in GLSL compiler (bug 24531)
++<li>Fixed Gallium Cell driver compilation failure.
++<li>Fixed glGetTexLevelParameter(GL_TEXTURE_INTERNAL_FORMAT) query so that
++ it returns the actual compressed format chosen.
++<li>Fixed glBitmap bugs in Intel drivers.
++<li>Fixed a number of Microsoft Visual Studio compilation problems.
++</ul>
++
++</body>
++</html>
+diff --git a/docs/relnotes.html b/docs/relnotes.html
+index 560a660..d8cbc79 100644
+--- a/docs/relnotes.html
++++ b/docs/relnotes.html
+@@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.
+ </p>
+
+ <UL>
++<LI><A HREF="relnotes-7.6.1.html">7.6.1 release notes</A>
+ <LI><A HREF="relnotes-7.6.html">7.6 release notes</A>
+ <LI><A HREF="relnotes-7.5.2.html">7.5.2 release notes</A>
+ <LI><A HREF="relnotes-7.5.1.html">7.5.1 release notes</A>
diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h
index 54147f7..59f6149 100644
--- a/include/GL/gl_mangle.h
@@ -240,6 +415,521 @@
#define glWeightbvARB MANGLE(WeightbvARB)
#define glWeightdvARB MANGLE(WeightdvARB)
#define glWeightfvARB MANGLE(WeightfvARB)
+diff --git a/include/GL/glext.h b/include/GL/glext.h
+index 24e6c5d..473b22a 100644
+--- a/include/GL/glext.h
++++ b/include/GL/glext.h
+@@ -29,9 +29,9 @@ extern "C" {
+ */
+
+ /* Header file version number, required by OpenGL ABI for Linux */
+-/* glext.h last updated $Date$ */
++/* glext.h last updated $Date$ */
+ /* Current version at http://www.opengl.org/registry/ */
+-#define GL_GLEXT_VERSION 54
++#define GL_GLEXT_VERSION 56
+
+ /* Function declaration macros - to move into glplatform.h */
+
+@@ -4236,7 +4236,7 @@ extern "C" {
+ #define GL_LUMINANCE16_SNORM 0x9019
+ #define GL_LUMINANCE16_ALPHA16_SNORM 0x901A
+ #define GL_INTENSITY16_SNORM 0x901B
+-/* reuse GL_R_SNORM */
++/* reuse GL_RED_SNORM */
+ /* reuse GL_RG_SNORM */
+ /* reuse GL_RGB_SNORM */
+ /* reuse GL_RGBA_SNORM */
+@@ -4311,6 +4311,88 @@ extern "C" {
+ #define GL_UNPACK_ROW_BYTES_APPLE 0x8A16
+ #endif
+
++#ifndef GL_APPLE_rgb_422
++#define GL_RGB_422_APPLE 0x8A1F
++/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */
++/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */
++#endif
++
++#ifndef GL_NV_video_capture
++#define GL_VIDEO_BUFFER_NV 0x9020
++#define GL_VIDEO_BUFFER_BINDING_NV 0x9021
++#define GL_FIELD_UPPER_NV 0x9022
++#define GL_FIELD_LOWER_NV 0x9023
++#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024
++#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
++#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
++#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027
++#define GL_VIDEO_BUFFER_PITCH_NV 0x9028
++#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
++#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A
++#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B
++#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
++#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
++#define GL_PARTIAL_SUCCESS_NV 0x902E
++#define GL_SUCCESS_NV 0x902F
++#define GL_FAILURE_NV 0x9030
++#define GL_YCBYCR8_422_NV 0x9031
++#define GL_YCBAYCR8A_4224_NV 0x9032
++#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033
++#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
++#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035
++#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
++#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037
++#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038
++#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039
++#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
++#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
++#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
++#endif
++
++#ifndef GL_NV_copy_image
++#endif
++
++#ifndef GL_EXT_separate_shader_objects
++#define GL_ACTIVE_PROGRAM_EXT 0x8B8D
++#endif
++
++#ifndef GL_NV_parameter_buffer_object2
++#endif
++
++#ifndef GL_NV_shader_buffer_load
++#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D
++#define GL_GPU_ADDRESS_NV 0x8F34
++#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35
++#endif
++
++#ifndef GL_NV_vertex_buffer_unified_memory
++#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
++#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F
++#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
++#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21
++#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22
++#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23
++#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24
++#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
++#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26
++#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
++#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28
++#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29
++#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A
++#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B
++#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C
++#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D
++#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E
++#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F
++#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30
++#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
++#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32
++#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33
++#endif
++
++#ifndef GL_NV_texture_barrier
++#endif
++
+
+ /*************************************************************/
+
+@@ -9245,6 +9327,136 @@ typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType,
+ #define GL_APPLE_row_bytes 1
+ #endif
+
++#ifndef GL_APPLE_rgb_422
++#define GL_APPLE_rgb_422 1
++#endif
++
++#ifndef GL_NV_video_capture
++#define GL_NV_video_capture 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint);
++GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint, GLuint, GLenum, GLintptrARB);
++GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint, GLuint, GLenum, GLenum, GLuint);
++GLAPI void APIENTRY glEndVideoCaptureNV (GLuint);
++GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint, GLenum, GLint *);
++GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint, GLuint, GLenum, GLint *);
++GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint, GLuint, GLenum, GLfloat *);
++GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint, GLuint, GLenum, GLdouble *);
++GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint, GLuint *, GLuint64EXT *);
++GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint, GLuint, GLenum, const GLint *);
++GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint, GLuint, GLenum, const GLfloat *);
++GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint, GLuint, GLenum, const GLdouble *);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
++typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
++typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
++typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
++typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
++typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
++typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
++typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
++typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
++typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
++typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
++typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
++#endif
++
++#ifndef GL_NV_copy_image
++#define GL_NV_copy_image 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glCopyImageSubDataNV (GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
++#endif
++
++#ifndef GL_EXT_separate_shader_objects
++#define GL_EXT_separate_shader_objects 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glUseShaderProgramEXT (GLenum, GLuint);
++GLAPI void APIENTRY glActiveProgramEXT (GLuint);
++GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum, const GLchar *);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
++typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
++typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
++#endif
++
++#ifndef GL_NV_parameter_buffer_object2
++#define GL_NV_parameter_buffer_object2 1
++#endif
++
++#ifndef GL_NV_shader_buffer_load
++#define GL_NV_shader_buffer_load 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glMakeBufferResidentNV (GLenum, GLenum);
++GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum);
++GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum);
++GLAPI void APIENTRY glNamedMakeBufferResidentNV (GLuint, GLenum);
++GLAPI void APIENTRY glNamedMakeBufferNonResidentNV (GLuint);
++GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint);
++GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum, GLenum, GLuint64EXT *);
++GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint, GLenum, GLuint64EXT *);
++GLAPI void APIENTRY glGetIntegerui64vNV (GLenum, GLuint64EXT *);
++GLAPI void APIENTRY glUniformui64NV (GLint, GLuint64EXT);
++GLAPI void APIENTRY glUniformui64vNV (GLint, GLsizei, const GLuint64EXT *);
++GLAPI void APIENTRY glGetUniformui64vNV (GLuint, GLint, GLuint64EXT *);
++GLAPI void APIENTRY glProgramUniformui64NV (GLuint, GLint, GLuint64EXT);
++GLAPI void APIENTRY glProgramUniformui64vNV (GLuint, GLint, GLsizei, const GLuint64EXT *);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
++typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
++typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
++typedef void (APIENTRYP PFNGLNAMEDMAKEBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
++typedef void (APIENTRYP PFNGLNAMEDMAKEBUFFERNONRESIDENTNVPROC) (GLuint buffer);
++typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
++typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
++typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
++typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
++typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
++typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
++typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
++typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
++typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
++#endif
++
++#ifndef GL_NV_vertex_buffer_unified_memory
++#define GL_NV_vertex_buffer_unified_memory 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glBufferAddressRangeNV (GLenum, GLuint, GLuint64EXT, GLsizeiptr);
++GLAPI void APIENTRY glVertexFormatNV (GLint, GLenum, GLsizei);
++GLAPI void APIENTRY glNormalFormatNV (GLenum, GLsizei);
++GLAPI void APIENTRY glColorFormatNV (GLint, GLenum, GLsizei);
++GLAPI void APIENTRY glIndexFormatNV (GLenum, GLsizei);
++GLAPI void APIENTRY glTexCoordFormatNV (GLint, GLenum, GLsizei);
++GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei);
++GLAPI void APIENTRY glSecondaryColorFormatNV (GLint, GLenum, GLsizei);
++GLAPI void APIENTRY glFogCoordFormatNV (GLenum, GLsizei);
++GLAPI void APIENTRY glVertexAttribFormatNV (GLuint, GLint, GLenum, GLboolean, GLsizei);
++GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint, GLint, GLenum, GLsizei);
++GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum, GLuint, GLuint64EXT *);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
++typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
++typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
++typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
++typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
++#endif
++
++#ifndef GL_NV_texture_barrier
++#define GL_NV_texture_barrier 1
++#ifdef GL_GLEXT_PROTOTYPES
++GLAPI void APIENTRY glTextureBarrierNV (void);
++#endif /* GL_GLEXT_PROTOTYPES */
++typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
++#endif
++
+
+ #ifdef __cplusplus
+ }
+diff --git a/include/GL/glxext.h b/include/GL/glxext.h
+index eac09f9..9ac0592 100644
+--- a/include/GL/glxext.h
++++ b/include/GL/glxext.h
+@@ -48,9 +48,9 @@ extern "C" {
+ /*************************************************************/
+
+ /* Header file version number, required by OpenGL ABI for Linux */
+-/* glxext.h last updated 2009/08/03 */
++/* glxext.h last updated 2009/10/08 */
+ /* Current version at http://www.opengl.org/registry/ */
+-#define GLX_GLXEXT_VERSION 23
++#define GLX_GLXEXT_VERSION 25
+
+ #ifndef GLX_VERSION_1_3
+ #define GLX_WINDOW_BIT 0x00000001
+@@ -382,6 +382,20 @@ extern "C" {
+ #ifndef GLX_NV_swap_group
+ #endif
+
++#ifndef GLX_NV_video_capture
++#define GLX_DEVICE_ID_NV 0x20CD
++#define GLX_UNIQUE_ID_NV 0x20CE
++#define GLX_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
++#endif
++
++#ifndef GLX_EXT_swap_control
++#define GLX_SWAP_INTERVAL_EXT 0x20F1
++#define GLX_MAX_SWAP_INTERVAL_EXT 0x20F2
++#endif
++
++#ifndef GLX_NV_copy_image
++#endif
++
+
+ /*************************************************************/
+
+@@ -415,6 +429,14 @@ typedef struct {
+ } GLXBufferClobberEventSGIX;
+ #endif
+
++#ifndef GLX_NV_video_output
++typedef unsigned int GLXVideoDeviceNV;
++#endif
++
++#ifndef GLX_NV_video_capture
++typedef XID GLXVideoCaptureDeviceNV;
++#endif
++
+ #ifndef GLEXT_64_TYPES_DEFINED
+ /* This code block is duplicated in glext.h, so must be protected */
+ #define GLEXT_64_TYPES_DEFINED
+@@ -827,14 +849,80 @@ typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawab
+
+ #ifndef GLX_NV_present_video
+ #define GLX_NV_present_video 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern unsigned int * glXEnumerateVideoDevicesNV (Display *, int, int *);
++extern int glXBindVideoDeviceNV (Display *, unsigned int, unsigned int, const int *);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef unsigned int * ( * PFNGLXENUMERATEVIDEODEVICESNVPROC) (Display *dpy, int screen, int *nelements);
++typedef int ( * PFNGLXBINDVIDEODEVICENVPROC) (Display *dpy, unsigned int video_slot, unsigned int video_device, const int *attrib_list);
+ #endif
+
+-#ifndef GLX_NV_video_out
+-#define GLX_NV_video_out 1
++#ifndef GLX_NV_video_output
++#define GLX_NV_video_output 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern int glXGetVideoDeviceNV (Display *, int, int, GLXVideoDeviceNV *);
++extern int glXReleaseVideoDeviceNV (Display *, int, GLXVideoDeviceNV);
++extern int glXBindVideoImageNV (Display *, GLXVideoDeviceNV, GLXPbuffer, int);
++extern int glXReleaseVideoImageNV (Display *, GLXPbuffer);
++extern int glXSendPbufferToVideoNV (Display *, GLXPbuffer, int, unsigned long *, GLboolean);
++extern int glXGetVideoInfoNV (Display *, int, GLXVideoDeviceNV, unsigned long *, unsigned long *);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef int ( * PFNGLXGETVIDEODEVICENVPROC) (Display *dpy, int screen, int numVideoDevices, GLXVideoDeviceNV *pVideoDevice);
++typedef int ( * PFNGLXRELEASEVIDEODEVICENVPROC) (Display *dpy, int screen, GLXVideoDeviceNV VideoDevice);
++typedef int ( * PFNGLXBINDVIDEOIMAGENVPROC) (Display *dpy, GLXVideoDeviceNV VideoDevice, GLXPbuffer pbuf, int iVideoBuffer);
++typedef int ( * PFNGLXRELEASEVIDEOIMAGENVPROC) (Display *dpy, GLXPbuffer pbuf);
++typedef int ( * PFNGLXSENDPBUFFERTOVIDEONVPROC) (Display *dpy, GLXPbuffer pbuf, int iBufferType, unsigned long *pulCounterPbuffer, GLboolean bBlock);
++typedef int ( * PFNGLXGETVIDEOINFONVPROC) (Display *dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo);
+ #endif
+
+ #ifndef GLX_NV_swap_group
+ #define GLX_NV_swap_group 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern Bool glXJoinSwapGroupNV (Display *, GLXDrawable, GLuint);
++extern Bool glXBindSwapBarrierNV (Display *, GLuint, GLuint);
++extern Bool glXQuerySwapGroupNV (Display *, GLXDrawable, GLuint *, GLuint *);
++extern Bool glXQueryMaxSwapGroupsNV (Display *, int, GLuint *, GLuint *);
++extern Bool glXQueryFrameCountNV (Display *, int, GLuint *);
++extern Bool glXResetFrameCountNV (Display *, int);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef Bool ( * PFNGLXJOINSWAPGROUPNVPROC) (Display *dpy, GLXDrawable drawable, GLuint group);
++typedef Bool ( * PFNGLXBINDSWAPBARRIERNVPROC) (Display *dpy, GLuint group, GLuint barrier);
++typedef Bool ( * PFNGLXQUERYSWAPGROUPNVPROC) (Display *dpy, GLXDrawable drawable, GLuint *group, GLuint *barrier);
++typedef Bool ( * PFNGLXQUERYMAXSWAPGROUPSNVPROC) (Display *dpy, int screen, GLuint *maxGroups, GLuint *maxBarriers);
++typedef Bool ( * PFNGLXQUERYFRAMECOUNTNVPROC) (Display *dpy, int screen, GLuint *count);
++typedef Bool ( * PFNGLXRESETFRAMECOUNTNVPROC) (Display *dpy, int screen);
++#endif
++
++#ifndef GLX_NV_video_capture
++#define GLX_NV_video_capture 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern int glXBindVideoCaptureDeviceNV (Display *, unsigned int, GLXVideoCaptureDeviceNV);
++extern GLXVideoCaptureDeviceNV * glXEnumerateVideoCaptureDevicesNV (Display *, int, int *);
++extern void glXLockVideoCaptureDeviceNV (Display *, GLXVideoCaptureDeviceNV);
++extern int glXQueryVideoCaptureDeviceNV (Display *, GLXVideoCaptureDeviceNV, int, int *);
++extern void glXReleaseVideoCaptureDeviceNV (Display *, GLXVideoCaptureDeviceNV);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef int ( * PFNGLXBINDVIDEOCAPTUREDEVICENVPROC) (Display *dpy, unsigned int video_capture_slot, GLXVideoCaptureDeviceNV device);
++typedef GLXVideoCaptureDeviceNV * ( * PFNGLXENUMERATEVIDEOCAPTUREDEVICESNVPROC) (Display *dpy, int screen, int *nelements);
++typedef void ( * PFNGLXLOCKVIDEOCAPTUREDEVICENVPROC) (Display *dpy, GLXVideoCaptureDeviceNV device);
++typedef int ( * PFNGLXQUERYVIDEOCAPTUREDEVICENVPROC) (Display *dpy, GLXVideoCaptureDeviceNV device, int attribute, int *value);
++typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display *dpy, GLXVideoCaptureDeviceNV device);
++#endif
++
++#ifndef GLX_EXT_swap_control
++#define GLX_EXT_swap_control 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern int glXSwapIntervalEXT (Display *, GLXDrawable, int);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef int ( * PFNGLXSWAPINTERVALEXTPROC) (Display *dpy, GLXDrawable drawable, int interval);
++#endif
++
++#ifndef GLX_NV_copy_image
++#define GLX_NV_copy_image 1
++#ifdef GLX_GLXEXT_PROTOTYPES
++extern void glXCopyImageSubDataNV (Display *, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLXContext, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei);
++#endif /* GLX_GLXEXT_PROTOTYPES */
++typedef void ( * PFNGLXCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+ #endif
+
+
+diff --git a/include/GL/wglext.h b/include/GL/wglext.h
+index 1f096fb..df96fbe 100644
+--- a/include/GL/wglext.h
++++ b/include/GL/wglext.h
+@@ -48,9 +48,9 @@ extern "C" {
+ /*************************************************************/
+
+ /* Header file version number */
+-/* wglext.h last updated 2009/08/03 */
++/* wglext.h last updated 2009/09/16 */
+ /* Current version at http://www.opengl.org/registry/ */
+-#define WGL_WGLEXT_VERSION 15
++#define WGL_WGLEXT_VERSION 17
+
+ #ifndef WGL_ARB_buffer_region
+ #define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+@@ -388,6 +388,14 @@ extern "C" {
+ #define WGL_GPU_NUM_SPI_AMD 0x21A8
+ #endif
+
++#ifndef NV_video_capture
++#define WGL_UNIQUE_ID_NV 0x20CE
++#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa-git.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.224&r2=1.225&f=u
More information about the pld-cvs-commit
mailing list