fontconfig mesa pixman xserver git update 4 July 2014

xserver          commit a61ca6f006d70343c88fe45206fae0669d1e8971
pixman           commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5
fontconfig       commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7
mesa             commit 9a37eb8adb6558a4abf47774b583cb582a0ae116

1 files changed, 3 insertions, 3 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
index 78a737094..489f537d8 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
@@ -132,13 +132,13 @@ st_BeginQuery(struct gl_context *ctx, struct gl_query_object *q)
        type == PIPE_QUERY_TIMESTAMP) {
       /* Determine time elapsed by emitting two timestamp queries. */
       if (!stq->pq_begin) {
-         stq->pq_begin = pipe->create_query(pipe, type);
+         stq->pq_begin = pipe->create_query(pipe, type, 0);
          stq->type = type;
       }
       pipe->end_query(pipe, stq->pq_begin);
    } else {
       if (!stq->pq) {
-         stq->pq = pipe->create_query(pipe, type);
+         stq->pq = pipe->create_query(pipe, type, q->Stream);
          stq->type = type;
       }
       if (stq->pq) {
@@ -164,7 +164,7 @@ st_EndQuery(struct gl_context *ctx, struct gl_query_object *q)
    if ((q->Target == GL_TIMESTAMP ||
         q->Target == GL_TIME_ELAPSED) &&
        !stq->pq) {
-      stq->pq = pipe->create_query(pipe, PIPE_QUERY_TIMESTAMP);
+      stq->pq = pipe->create_query(pipe, PIPE_QUERY_TIMESTAMP, 0);
       stq->type = PIPE_QUERY_TIMESTAMP;
    }