X Strike Force X.Org X11 SVN commit: r4110 - in branches/experimental/xserver/xorg-server/debian: . patches
Author: beatle
Date: 2006-12-01 15:14:57 -0500 (Fri, 01 Dec 2006)
New Revision: 4110
Added:
branches/experimental/xserver/xorg-server/debian/patches/38_GetDrawableAttributes.patch
Modified:
branches/experimental/xserver/xorg-server/debian/changelog
branches/experimental/xserver/xorg-server/debian/patches/series
Log:
Add 38_GetDrawableAttributes.patch which readds support for the
GetDrawableAttributes extension that's needed for compiz to work properly.
This should only be a temporary fix until the server has a complete GLX 1.3
implementation.
Update the changelog.
Modified: branches/experimental/xserver/xorg-server/debian/changelog
===================================================================
--- branches/experimental/xserver/xorg-server/debian/changelog 2006-12-01 13:06:24 UTC (rev 4109)
+++ branches/experimental/xserver/xorg-server/debian/changelog 2006-12-01 20:14:57 UTC (rev 4110)
@@ -35,8 +35,12 @@
* 36_fix_ffs.patch: update
* 37_Fix-__glXDRIbindTexImage-for-32-bpp-on-big-endian-platforms.diff:
remove, applied upstream
+ * Add 37_build-mesa-mipmap.patch that adds the missing mipmap.c to libmain's
+ sources.
+ * Add 38_GetDrawableAttributes.patch which readds support for the
+ GetDrawableAttributes extension that's needed for compiz to work properly.
- -- Thierry Reding <thierry@gilfi.de> Sun, 26 Nov 2006 03:10:30 +0100
+ -- Thierry Reding <thierry@gilfi.de> Fri, 1 Dec 2006 20:32:34 +0100
xorg-server (2:1.1.1-11) unstable; urgency=low
Added: branches/experimental/xserver/xorg-server/debian/patches/38_GetDrawableAttributes.patch
===================================================================
--- branches/experimental/xserver/xorg-server/debian/patches/38_GetDrawableAttributes.patch (rev 0)
+++ branches/experimental/xserver/xorg-server/debian/patches/38_GetDrawableAttributes.patch 2006-12-01 20:14:57 UTC (rev 4110)
@@ -0,0 +1,39 @@
+--- a/GL/glx/indirect_table.c
++++ b/GL/glx/indirect_table.c
+@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di
+
+ /*****************************************************************/
+ /* tree depth = 13 */
+-static const int_fast16_t VendorPriv_dispatch_tree[155] = {
++static const int_fast16_t VendorPriv_dispatch_tree[159] = {
+ /* [0] -> opcode range [0, 131072], node depth 1 */
+ 2,
+ 5,
+@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis
+ /* [152] -> opcode range [65536, 65552], node depth 13 */
+ 1,
+ LEAF(88),
++ 156,
+ EMPTY_LEAF,
+
++ /* [156] -> opcode range [65544, 65552], node depth 13 */
++ 1,
++ LEAF(96),
++ EMPTY_LEAF,
+ };
+
+-static const void *VendorPriv_function_table[96][2] = {
++static const void *VendorPriv_function_table[99][2] = {
+ /* [ 0] = 0 */ {NULL, NULL},
+ /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
+ /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
+@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t
+ /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
+ /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
+ /* [ 95] = 65543 */ {NULL, NULL},
++ /* [ 96] = 65544 */ {NULL, NULL},
++ /* [ 97] = 65545 */ {NULL, NULL},
++ /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
+ };
+
+ const struct __glXDispatchInfo VendorPriv_dispatch_info = {
Modified: branches/experimental/xserver/xorg-server/debian/patches/series
===================================================================
--- branches/experimental/xserver/xorg-server/debian/patches/series 2006-12-01 13:06:24 UTC (rev 4109)
+++ branches/experimental/xserver/xorg-server/debian/patches/series 2006-12-01 20:14:57 UTC (rev 4110)
@@ -18,3 +18,4 @@
35_randr_byteswap.patch
36_fix_ffs.patch
37_build-mesa-mipmap.patch
+38_GetDrawableAttributes.patch
Reply to: