From: Chia-I Wu <olvaffe@gmail.com>
Date: Tue, 2 Feb 2010 02:40:32 +0000 (+0800)
Subject: progs/es2: Fix an assertion failure in tri.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=5fa4ea29343757084d16ebb86e29009742d50dac

progs/es2: Fix an assertion failure in tri.

EGL_SURFACE_TYPE is a config attribute, not a surface attribute.  Thanks
to Mike Stroyan for pointing out this error.
---

diff --git a/progs/es2/xegl/tri.c b/progs/es2/xegl/tri.c
index 7729a099578..8981d8a7e21 100644
--- a/progs/es2/xegl/tri.c
+++ b/progs/es2/xegl/tri.c
@@ -334,14 +334,15 @@ make_x_window(Display *x_dpy, EGLDisplay egl_dpy,
       exit(1);
    }
 
+   /* sanity checks */
    {
       EGLint val;
       eglQuerySurface(egl_dpy, *surfRet, EGL_WIDTH, &val);
       assert(val == width);
       eglQuerySurface(egl_dpy, *surfRet, EGL_HEIGHT, &val);
       assert(val == height);
-      eglQuerySurface(egl_dpy, *surfRet, EGL_SURFACE_TYPE, &val);
-      assert(val == EGL_WINDOW_BIT);
+      assert(eglGetConfigAttrib(egl_dpy, config, EGL_SURFACE_TYPE, &val));
+      assert(val & EGL_WINDOW_BIT);
    }
 
    XFree(visInfo);