<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[338] AppleSGLX/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/xquartz/changeset/338">338</a></dd>
<dt>Author</dt> <dd>gstaplin@apple.com</dd>
<dt>Date</dt> <dd>2009-04-28 20:40:04 -0700 (Tue, 28 Apr 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>tests/simple/simple.mk: Add the query_drawable test and make it build.
tests/simple/query_drawable.c: Add a test for glXQueryDrawable, other than the existing pbuffer test.
tests/tests.mk: build testbuilds/query_drawable
glx_pbuffer.c: Fix a deadlock reported by Ken Thomases. The deadlock occurred in the
glXQueryDrawable path when the drawable was a window. The paths for the valid pixmaps and
buffers were unaffected. Thank you Ken, for your detailed analysis.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#AppleSGLXtrunkglx_pbufferc">AppleSGLX/trunk/glx_pbuffer.c</a></li>
<li><a href="#AppleSGLXtrunktestssimplesimplemk">AppleSGLX/trunk/tests/simple/simple.mk</a></li>
<li><a href="#AppleSGLXtrunkteststestsmk">AppleSGLX/trunk/tests/tests.mk</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#AppleSGLXtrunktestssimplequery_drawablec">AppleSGLX/trunk/tests/simple/query_drawable.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="AppleSGLXtrunkglx_pbufferc"></a>
<div class="modfile"><h4>Modified: AppleSGLX/trunk/glx_pbuffer.c (337 => 338)</h4>
<pre class="diff"><span>
<span class="info">--- AppleSGLX/trunk/glx_pbuffer.c 2009-04-12 02:24:16 UTC (rev 337)
+++ AppleSGLX/trunk/glx_pbuffer.c 2009-04-29 03:40:04 UTC (rev 338)
</span><span class="lines">@@ -44,21 +44,6 @@
</span><span class="cx"> #include "apple_glx_drawable.h"
</span><span class="cx"> #include "glx_error.h"
</span><span class="cx">
</span><del>-
-static pthread_mutex_t queryLock = PTHREAD_MUTEX_INITIALIZER;
-
-/*
- * This is protected by the queryLock.
- * Unfortunately XSetErrorHandler requires a lock.
- */
-static int errorCount = 0;
-
-static int
-errorHandler(Display *dpy, XErrorEvent *error) {
- ++errorCount;
- return 0; /* don't exit */
-}
-
</del><span class="cx"> /**
</span><span class="cx"> * Create a new pbuffer.
</span><span class="cx"> */
</span><span class="lines">@@ -133,7 +118,6 @@
</span><span class="cx"> Window root;
</span><span class="cx"> int x, y;
</span><span class="cx"> unsigned int width, height, bd, depth;
</span><del>- int (*old_handler)(Display *, XErrorEvent *);
</del><span class="cx">
</span><span class="cx"> if(apple_glx_pixmap_query(drawable, attribute, value))
</span><span class="cx"> return; /*done*/
</span><span class="lines">@@ -142,33 +126,27 @@
</span><span class="cx"> return; /*done*/
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * This is used because XSetErrorHandler changes global state.
- * Ideally we should prevent other threads from calling XSetErrorHandler.
- * Another way of handling this might be a private display connection.
</del><ins>+ * The OpenGL spec states that we should report GLXBadDrawable if
+ * the drawable is invalid, however doing so would require that we
+ * use XSetErrorHandler(), which is known to not be thread safe.
+ * If we use a round-trip call to validate the drawable, there could
+ * be a race, so instead we just opt in favor of letting the
+ * XGetGeometry request fail with a GetGeometry request X error
+ * rather than GLXBadDrawable, in what is hoped to be a rare
+ * case of an invalid drawable. In practice most and possibly all
+ * X11 apps using GLX shouldn't notice a difference.
</ins><span class="cx"> */
</span><del>- pthread_mutex_lock(&queryLock);
-
- old_handler = XSetErrorHandler(errorHandler);
-
</del><span class="cx"> if(XGetGeometry(dpy, drawable, &root, &x, &y, &width, &height, &bd, &depth)) {
</span><span class="cx"> switch(attribute) {
</span><span class="cx"> case GLX_WIDTH:
</span><span class="cx"> *value = width;
</span><del>- return;
</del><ins>+ break;
</ins><span class="cx">
</span><span class="cx"> case GLX_HEIGHT:
</span><span class="cx"> *value = height;
</span><del>- return;
</del><ins>+ break;
</ins><span class="cx"> }
</span><del>- /*FALL THROUGH*/
</del><span class="cx"> }
</span><del>-
- XSetErrorHandler(old_handler);
-
- pthread_mutex_unlock(&queryLock);
-
- __glXSendError(dpy, GLXBadDrawable, drawable, X_GLXGetDrawableAttributes,
- false);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="AppleSGLXtrunktestssimplequery_drawablec"></a>
<div class="addfile"><h4>Added: AppleSGLX/trunk/tests/simple/query_drawable.c (0 => 338)</h4>
<pre class="diff"><span>
<span class="info">--- AppleSGLX/trunk/tests/simple/query_drawable.c (rev 0)
+++ AppleSGLX/trunk/tests/simple/query_drawable.c 2009-04-29 03:40:04 UTC (rev 338)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <GL/glx.h>
+
+int main(int argc, char *argv[]) {
+ Display *dpy;
+ int eventbase, errorbase;
+ int major, minor;
+ Window root;
+ unsigned int width, height;
+
+ dpy = XOpenDisplay(NULL);
+
+ if(NULL == dpy) {
+ fprintf(stderr, "error: unable to open display!\n");
+ return EXIT_FAILURE;
+ }
+
+ if(!glXQueryExtension(dpy, &eventbase, &errorbase)) {
+ fprintf(stderr, "GLX is not available!\n");
+ return EXIT_FAILURE;
+ }
+
+ printf("GLX eventbase %d errorbase %d\n", eventbase, errorbase);
+
+ if(!glXQueryVersion(dpy, &major, &minor)) {
+ fprintf(stderr, "GLX version query error!\n");
+ return EXIT_FAILURE;
+ }
+
+ printf("GLX version: %d.%d\n", major, minor);
+
+ root = DefaultRootWindow(dpy);
+
+ glXQueryDrawable(dpy, root, GLX_WIDTH, &width);
+
+ printf("query 1: width %d\n", width);
+
+ glXQueryDrawable(dpy, root, GLX_HEIGHT, &height);
+
+ printf("query 2: height %d\n", height);
+
+ return EXIT_SUCCESS;
+}
</ins></span></pre></div>
<a id="AppleSGLXtrunktestssimplesimplemk"></a>
<div class="modfile"><h4>Modified: AppleSGLX/trunk/tests/simple/simple.mk (337 => 338)</h4>
<pre class="diff"><span>
<span class="info">--- AppleSGLX/trunk/tests/simple/simple.mk 2009-04-12 02:24:16 UTC (rev 337)
+++ AppleSGLX/trunk/tests/simple/simple.mk 2009-04-29 03:40:04 UTC (rev 338)
</span><span class="lines">@@ -13,3 +13,5 @@
</span><span class="cx"> $(TEST_BUILD_DIR)/glthreads: tests/simple/glthreads.c $(LIBGL)
</span><span class="cx"> $(CC) -DPTHREADS -pthread tests/simple/glthreads.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glthreads $(LINK_TEST)
</span><span class="cx">
</span><ins>+$(TEST_BUILD_DIR)/query_drawable: tests/simple/query_drawable.c $(LIBGL)
+ $(CC) tests/simple/query_drawable.c $(INCLUDE) -o $@ $(LINK_TEST)
</ins></span></pre></div>
<a id="AppleSGLXtrunkteststestsmk"></a>
<div class="modfile"><h4>Modified: AppleSGLX/trunk/tests/tests.mk (337 => 338)</h4>
<pre class="diff"><span>
<span class="info">--- AppleSGLX/trunk/tests/tests.mk 2009-04-12 02:24:16 UTC (rev 337)
+++ AppleSGLX/trunk/tests/tests.mk 2009-04-29 03:40:04 UTC (rev 338)
</span><span class="lines">@@ -35,5 +35,6 @@
</span><span class="cx"> $(TEST_BUILD_DIR)/triangle_glx_surface \
</span><span class="cx"> $(TEST_BUILD_DIR)/triangle_glx_surface-2 \
</span><span class="cx"> $(TEST_BUILD_DIR)/triangle_glx_withdraw_remap \
</span><del>- $(TEST_BUILD_DIR)/triangle_glx_destroy_relation
</del><ins>+ $(TEST_BUILD_DIR)/triangle_glx_destroy_relation \
+ $(TEST_BUILD_DIR)/query_drawable
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>