<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 70.85pt 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"PL" link=3D"#0563C1" vlink=3D"#954F72">
<div class=3D"WordSection1">
<p class=3D"MsoNormal"><span lang=3D"EN-US"> Fix for thro=
wing BadDrawable (invalid Pixmap or Window parameter)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> by Xserver w=
hen calling XCreatePixmap or fill_bitmap from<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> DRI_glXUseXF=
ont.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> <o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> current=
Drawable which came from __glXGetCurrentContext was not correct in<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> this case, w=
e use DefaultRootWindow(dpy) instead.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">Signed-off-by: Lukasz Maniak &l=
t;lukasz.maniak@intel.com><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">---<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">src/glx/xfont.c | 6 ++-=
---<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">1 file changed, 2 insertions(&#=
43;), 4 deletions(-)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">diff --git a/src/glx/xfont.c b/=
src/glx/xfont.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">index 316c585..60e28ab 100644<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">--- a/src/glx/xfont.c<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">+++ b/src/glx/xfont=
.c<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">@@ -215,7 +215,6 @@ _X_HIDD=
EN void<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">DRI_glXUseXFont(struct glx_cont=
ext *CC, Font font, int first, int count, int listbase)<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">{<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> Display *dpy=
;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">- Window win;<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> Pixmap pixma=
p;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> GC gc; <o:p>=
</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> XGCValu=
es values;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">@@ -231,7 +230,6 @@ DRI_glX=
UseXFont(struct glx_context *CC, Font font, int first, int count, int lis<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> int i;<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> dpy =3D=
CC->currentDpy;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">- win =3D CC->cu=
rrentDrawable;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> fs =3D =
XQueryFont(dpy, font);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> if (!fs) {<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">@@ -279,7 +277,7 @@ DRI_glX=
UseXFont(struct glx_context *CC, Font font, int first, int count, int lis<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> glPixelStore=
i(GL_UNPACK_SKIP_PIXELS, 0);
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> glPixel=
Storei(GL_UNPACK_ALIGNMENT, 1);
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> <o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">- pixmap =3D XCreat=
ePixmap(dpy, win, 10, 10, 1);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">+ pixmap =3D XC=
reatePixmap(dpy, DefaultRootWindow(dpy), 10, 10, 1);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> values.foreg=
round =3D BlackPixel(dpy, DefaultScreen(dpy));<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> values.backg=
round =3D WhitePixel(dpy, DefaultScreen(dpy));<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> values.font =
=3D fs->fid;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">@@ -342,7 +340,7 @@ DRI_glX=
UseXFont(struct glx_context *CC, Font font, int first, int count, int lis<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> &=
nbsp; if (valid && (bm_width > 0) && (bm_height > 0))=
{<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> &=
nbsp; memset(bm, '\0', bm_width * bm_height);<o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">- =
fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, =
bm);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">+ &n=
bsp; fill_bitmap(dpy, DefaultRootWindow(dpy), gc, bm_widt=
h, bm_height, x, y, c, bm);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"> &=
nbsp; glBitmap(width, height, x0, y0, dx, dy, bm);<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"></span>#ifdef DEBUG<o:p></o:p><=
/p>
<p class=3D"MsoNormal">-- <o:p></o:p></p>
<p class=3D"MsoNormal">1.8.1.2<o:p></o:p></p>
</div>
</body>
</html>