rpms/mesa/devel mesa-6.5-texture-from-pixmap-fixes.patch, 1.1, 1.2 mesa.spec, 1.58, 1.59
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon May 29 23:26:47 UTC 2006
Author: krh
Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13115
Modified Files:
mesa-6.5-texture-from-pixmap-fixes.patch mesa.spec
Log Message:
* Mon May 29 2006 Kristian Høgsberg <krh at redhat.com> - 6.5-6
- Update mesa-6.5-texture-from-pixmap-fixes.patch to include new
tokens and change tfp functions to return void. Yes, a new mesa
snapshot would be nice.
mesa-6.5-texture-from-pixmap-fixes.patch:
include/GL/glx.h | 57 +++++++++++++++++++++++++++++++++++---------------
src/glx/x11/glxcmds.c | 23 ++++++++++----------
2 files changed, 52 insertions(+), 28 deletions(-)
Index: mesa-6.5-texture-from-pixmap-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.5-texture-from-pixmap-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-6.5-texture-from-pixmap-fixes.patch 1 Apr 2006 06:05:02 -0000 1.1
+++ mesa-6.5-texture-from-pixmap-fixes.patch 29 May 2006 23:26:43 -0000 1.2
@@ -1,11 +1,6 @@
-Index: include/GL/glx.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/include/GL/glx.h,v
-retrieving revision 1.49
-diff -u -p -r1.49 glx.h
---- include/GL/glx.h 26 Mar 2006 05:09:03 -0000 1.49
-+++ include/GL/glx.h 31 Mar 2006 18:09:02 -0000
-@@ -355,20 +355,6 @@ typedef GLuint (* PFNGLXGETMEMORYOFFSETM
+--- ./include/GL/glx.htexture-from-pixmap-fixes 2006-03-31 12:31:46.000000000 -0500
++++ ./include/GL/glx.h 2006-05-29 18:53:59.000000000 -0400
+@@ -355,20 +355,6 @@
/*
@@ -26,35 +21,65 @@
* Remove this when glxext.h is updated.
*/
#ifndef GLX_NV_float_buffer
-@@ -423,9 +409,16 @@ typedef int (*PFNGLXGETSWAPINTERVALMESAP
+@@ -423,10 +409,47 @@
#ifndef GLX_EXT_texture_from_pixmap
#define GLX_EXT_texture_from_pixmap 1
-/* XXX need enums/tokens! */
-+/* XXX need real enums/tokens, these are just place holders! */
++#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
++#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
++#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
++#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
++#define GLX_Y_INVERTED_EXT 0x20D4
+
-+#define GLX_TEXTURE_TARGET_EXT 0x6001
-+#define GLX_TEXTURE_2D_EXT 0x6002
-+#define GLX_TEXTURE_RECTANGLE_EXT 0x6003
-+#define GLX_NO_TEXTURE_EXT 0x6004
-+#define GLX_FRONT_LEFT_EXT 0x6005
-+#define GLX_Y_INVERTED_EXT 0x6006
++#define GLX_TEXTURE_FORMAT_EXT 0x20D5
++#define GLX_TEXTURE_TARGET_EXT 0x20D6
++#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
++
++#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
++#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
++#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
++
++#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
++#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
++#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
++
++#define GLX_TEXTURE_1D_EXT 0x20DB
++#define GLX_TEXTURE_2D_EXT 0x20DC
++#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
++
++#define GLX_FRONT_LEFT_EXT 0x20DE
++#define GLX_FRONT_RIGHT_EXT 0x20DF
++#define GLX_BACK_LEFT_EXT 0x20E0
++#define GLX_BACK_RIGHT_EXT 0x20E1
++#define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT
++#define GLX_BACK_EXT GLX_BACK_LEFT_EXT
++#define GLX_AUX0_EXT 0x20E2
++#define GLX_AUX1_EXT 0x20E3
++#define GLX_AUX2_EXT 0x20E4
++#define GLX_AUX3_EXT 0x20E5
++#define GLX_AUX4_EXT 0x20E6
++#define GLX_AUX5_EXT 0x20E7
++#define GLX_AUX6_EXT 0x20E8
++#define GLX_AUX7_EXT 0x20E9
++#define GLX_AUX8_EXT 0x20EA
++#define GLX_AUX9_EXT 0x20EB
-extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
-+extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attribList);
- extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+-extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
++extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attribList);
++extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
#endif /* GLX_EXT_texture_from_pixmap */
-Index: src/glx/x11/glxcmds.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxcmds.c,v
-retrieving revision 1.13
-diff -u -p -r1.13 glxcmds.c
---- src/glx/x11/glxcmds.c 9 Mar 2006 16:25:46 -0000 1.13
-+++ src/glx/x11/glxcmds.c 31 Mar 2006 18:09:07 -0000
-@@ -2592,7 +2592,8 @@ PUBLIC Bool glXSet3DfxModeMESA( int mode
- PUBLIC Bool glXBindTexImageEXT(Display *dpy,
+--- ./src/glx/x11/glxcmds.ctexture-from-pixmap-fixes 2006-03-31 12:29:46.000000000 -0500
++++ ./src/glx/x11/glxcmds.c 2006-05-29 18:49:11.000000000 -0400
+@@ -2641,9 +2641,10 @@
+ }
+ /*@}*/
+
+-PUBLIC Bool glXBindTexImageEXT(Display *dpy,
++PUBLIC void glXBindTexImageEXT(Display *dpy,
GLXDrawable drawable,
- int buffer)
+ int buffer,
@@ -62,3 +87,65 @@
{
xGLXVendorPrivateReq *req;
GLXContext gc = __glXGetCurrentContext();
+@@ -2652,16 +2653,16 @@
+ CARD8 opcode;
+
+ if (gc == NULL)
+- return False;
++ return;
+
+ #ifdef GLX_DIRECT_RENDERING
+ if (gc->isDirect)
+- return False;
++ return;
+ #endif
+
+ opcode = __glXSetupForCommand(dpy);
+ if (!opcode)
+- return False;
++ return;
+
+ LockDisplay(dpy);
+ GetReqExtra(GLXVendorPrivate, sizeof(CARD32)+sizeof(INT32),req);
+@@ -2679,10 +2680,10 @@
+ UnlockDisplay(dpy);
+ SyncHandle();
+
+- return True;
++ return;
+ }
+
+-PUBLIC Bool glXReleaseTexImageEXT(Display *dpy,
++PUBLIC void glXReleaseTexImageEXT(Display *dpy,
+ GLXDrawable drawable,
+ int buffer)
+ {
+@@ -2693,16 +2694,16 @@
+ CARD8 opcode;
+
+ if (gc == NULL)
+- return False;
++ return;
+
+ #ifdef GLX_DIRECT_RENDERING
+ if (gc->isDirect)
+- return False;
++ return;
+ #endif
+
+ opcode = __glXSetupForCommand(dpy);
+ if (!opcode)
+- return False;
++ return;
+
+ LockDisplay(dpy);
+ GetReqExtra(GLXVendorPrivate, sizeof(CARD32)+sizeof(INT32),req);
+@@ -2720,7 +2721,7 @@
+ UnlockDisplay(dpy);
+ SyncHandle();
+
+- return True;
++ return;
+ }
+
+ /**
Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mesa.spec 17 May 2006 20:34:37 -0000 1.58
+++ mesa.spec 29 May 2006 23:26:43 -0000 1.59
@@ -53,7 +53,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 6.5
-Release: 6
+Release: 7
License: MIT/X11
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -248,7 +248,7 @@
# According to Adam, this patch makes metacity's compositing
# manager noticeably faster, but also may be a little too big of
# a change for post feature freeze. Leaving off for now...
-%patch200 -p0 -b texture-from-pixmap-fixes
+%patch200 -p0 -b .texture-from-pixmap-fixes
%patch201 -p1 -b .radeon-use-right-format
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
@@ -435,6 +435,11 @@
%{_bindir}/glxinfo
%changelog
+* Mon May 29 2006 Kristian Høgsberg <krh at redhat.com> - 6.5-6
+- Update mesa-6.5-texture-from-pixmap-fixes.patch to include new
+ tokens and change tfp functions to return void. Yes, a new mesa
+ snapshot would be nice.
+
* Wed May 17 2006 Mike A. Harris <mharris at redhat.com> 6.5-6
- Add "BuildRequires: makedepend" for bug (#191967)
More information about the fedora-cvs-commits
mailing list