2007-09-28 04:24:42 -04:00
|
|
|
$OpenBSD: patch-x11_blit_c,v 1.2 2007/09/28 08:24:42 jakemsr Exp $
|
|
|
|
--- x11/blit.c.orig Tue May 4 02:41:59 2004
|
|
|
|
+++ x11/blit.c Thu Sep 27 15:37:48 2007
|
|
|
|
@@ -42,7 +42,9 @@ static unsigned int display_bytes = 0;
|
2004-06-24 20:14:38 -04:00
|
|
|
static unsigned int pixmap_bytes = 0;
|
|
|
|
static bool x11_byteswap = 0;
|
|
|
|
static int no_mitshm = 0;
|
|
|
|
+#if HAVE_GL
|
|
|
|
static int gl_error = 0;
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
#if HAVE_LIBXV
|
|
|
|
static int ver, rel, req, ev, err;
|
2007-09-28 04:24:42 -04:00
|
|
|
@@ -90,6 +92,7 @@ catch_no_mitshm(Display * dpy, XErrorEvent * event)
|
2004-06-24 20:14:38 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#if HAVE_GL
|
|
|
|
static int
|
|
|
|
catch_gl_error(Display * dpy, XErrorEvent * event)
|
|
|
|
{
|
2007-09-28 04:24:42 -04:00
|
|
|
@@ -97,6 +100,7 @@ catch_gl_error(Display * dpy, XErrorEvent * event)
|
2004-06-24 20:14:38 -04:00
|
|
|
gl_error++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------ */
|
|
|
|
/* plain X11 stuff */
|
2007-09-28 04:24:42 -04:00
|
|
|
@@ -672,7 +676,9 @@ enum blit_status {
|
2004-06-24 20:14:38 -04:00
|
|
|
STATUS_BROKEN = 1,
|
|
|
|
STATUS_CONVERT = 2,
|
|
|
|
STATUS_XVIDEO = 3,
|
|
|
|
+#if HAVE_GL
|
|
|
|
STATUS_OPENGL = 4,
|
|
|
|
+#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
struct blit_state {
|