frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x. 

Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
    resolve some of the careless mixtures of ulong and uint (which are
    different size on
64bit). Bugzilla #6438.
This commit is contained in:
Egbert Eich 2006-03-30 18:48:11 +00:00
parent 6d7ad353ba
commit 9da1d2257d
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-03-30 Egbert Eich <eich_at_freedesktop_dot_org>
* include/colormapst.h:
* include/pixmapstr.h:
* mi/miwideline.c: (miFillRectPolyHelper), (miLineArc):
Fixes for some vsw4 failures on 64bit BE platforms such as
PPC64 and s390x. Provided by Hong Bo Peng of IBM (slightly
modified). Patches try to resolve some of the careless
mixtures of ulong and uint (which are different size on
64bit). Bugzilla #6438.
2006-03-29 Kristian Høgsberg <krh@redhat.com>
* GL/glx/indirect_dispatch.c:

2
include/colormapst.h
View File

@ -97,7 +97,7 @@ typedef struct _ColormapRec
{
VisualPtr pVisual;
short class; /* PseudoColor or DirectColor */
long mid; /* client's name for colormap */
XID mid; /* client's name for colormap */
ScreenPtr pScreen; /* screen map is associated with */
short flags; /* 1 = IsDefault
* 2 = AllAllocated */

2
include/pixmapstr.h
View File

@ -58,7 +58,7 @@ typedef struct _Drawable {
unsigned char class; /* specific to type */
unsigned char depth;
unsigned char bitsPerPixel;
unsigned long id; /* resource id */
XID id; /* resource id */
short x; /* window: screen absolute, pixmap: 0 */
short y; /* window: screen absolute, pixmap: 0 */
unsigned short width;

9
mi/miwideline.c
View File

@ -121,7 +121,8 @@ miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height,
oldPixel = pGC->fgPixel;
if (pixel != oldPixel)
{
DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
XID tmpPixel = (XID)pixel;
DoChangeGC (pGC, GCForeground, tmpPixel, FALSE);
ValidateGC (pDrawable, pGC);
}
}
@ -219,7 +220,8 @@ miFillRectPolyHelper (
oldPixel = pGC->fgPixel;
if (pixel != oldPixel)
{
DoChangeGC (pGC, GCForeground, (XID *)&pixel, FALSE);
XID tmpPixel = (XID)pixel;
DoChangeGC (pGC, GCForeground, tmpPixel, FALSE);
ValidateGC (pDrawable, pGC);
}
(*pGC->ops->PolyFillRect) (pDrawable, pGC, 1, &rect);
@ -1070,7 +1072,8 @@ miLineArc (
oldPixel = pGC->fgPixel;
if (pixel != oldPixel)
{
DoChangeGC(pGC, GCForeground, (XID *)&pixel, FALSE);
XID tmpPixel = (XID)pixel;
DoChangeGC(pGC, GCForeground, tmpPixel, FALSE);
ValidateGC (pDraw, pGC);
}
}