[Mesa-dev,Bug,54372] GLX_INTEL_swap_event crashes driver when swapping window buffers

Submitted by bugzilla-daemon@freedesktop.org on June 12, 2014, 1:10 a.m.

Details

Message ID bug-54372-598-bcFnHsUuFT@http.bugs.freedesktop.org/
State New
Headers show

Not browsing as part of any series.

Commit Message

bugzilla-daemon@freedesktop.org June 12, 2014, 1:10 a.m.
https://bugs.freedesktop.org/show_bug.cgi?id=54372

--- Comment #22 from danmanj@gmail.com ---
Ok, so this patch fixes glxUseXFont for glxwindows.

Any idea when these patches will go in?


    GLint skiprows, skippixels, alignment;
@@ -233,6 +234,10 @@ DRI_glXUseXFont(struct glx_context *CC, Font font, int
first, int count, int lis
    dpy = CC->currentDpy;
    win = CC->currentDrawable;

+   wtf = GetGLXDRIDrawable(CC->currentDpy, CC->currentDrawable);
+   if(wtf)
+          win = wtf->xDrawable;
+
    fs = XQueryFont(dpy, font);
    if (!fs) {
       __glXSetError(CC, GL_INVALID_VALUE);

Patch hide | download patch | download mbox

diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index 316c585..3c34b1d 100644
--- a/src/glx/xfont.c
+++ b/src/glx/xfont.c
@@ -221,6 +221,7 @@  DRI_glXUseXFont(struct glx_context *CC, Font font, int
first, int count, int lis
    XGCValues values;
    unsigned long valuemask;
    XFontStruct *fs;
+   __GLXDRIdrawable *wtf;

    GLint swapbytes, lsbfirst, rowlength;