fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013

xserver          commit 8928f8fa0bb154ce437af703ff702016f0dcf127
xkeyboard-config commit e5c6729f3679fe87a703eb1d7ec1cf0a61814ca8
libXau           commit f5a57d8a21a34d7084cce294e24c0422e02ef8ef
fontconfig       commit 18bf57c70aafcad031c0b43756b754dcaf6a756a
mesa             commit eff66bc9f855fff5c4f5f57f247254a97431e8ad

1 files changed, 92 insertions, 0 deletions

diff --git a/mesalib/src/gallium/auxiliary/hud/hud_private.h b/mesalib/src/gallium/auxiliary/hud/hud_private.h
new file mode 100644
index 000000000..2b7d56bb1
--- /dev/null
+++ b/mesalib/src/gallium/auxiliary/hud/hud_private.h
@@ -0,0 +1,92 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Marek Olšák <maraeo@gmail.com>
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#ifndef HUD_PRIVATE_H
+#define HUD_PRIVATE_H
+
+#include "pipe/p_context.h"
+#include "util/u_double_list.h"
+
+struct hud_graph {
+   /* initialized by common code */
+   struct list_head head;
+   struct hud_pane *pane;
+   float color[3];
+   float *vertices; /* ring buffer of vertices */
+
+   /* name and query */
+   char name[128];
+   void *query_data;
+   void (*query_new_value)(struct hud_graph *gr);
+   void (*free_query_data)(void *ptr);
+
+   /* mutable variables */
+   unsigned num_vertices;
+   unsigned index; /* vertex index being updated */
+   uint64_t current_value;
+};
+
+struct hud_pane {
+   struct list_head head;
+   unsigned x1, y1, x2, y2;
+   unsigned inner_x1;
+   unsigned inner_y1;
+   unsigned inner_x2;
+   unsigned inner_y2;
+   unsigned inner_width;
+   unsigned inner_height;
+   float yscale;
+   unsigned max_num_vertices;
+   uint64_t max_value;
+   boolean uses_byte_units;
+   uint64_t period; /* in microseconds */
+
+   struct list_head graph_list;
+   unsigned num_graphs;
+};
+
+
+/* core */
+void hud_pane_add_graph(struct hud_pane *pane, struct hud_graph *gr);
+void hud_pane_set_max_value(struct hud_pane *pane, uint64_t value);
+void hud_graph_add_value(struct hud_graph *gr, uint64_t value);
+
+/* graphs/queries */
+#define ALL_CPUS ~0 /* optionally set as cpu_index */
+
+int hud_get_num_cpus(void);
+
+void hud_fps_graph_install(struct hud_pane *pane);
+void hud_cpu_graph_install(struct hud_pane *pane, unsigned cpu_index);
+void hud_pipe_query_install(struct hud_pane *pane, struct pipe_context *pipe,
+                            const char *name, unsigned query_type,
+                            unsigned result_index,
+                            uint64_t max_value, boolean uses_byte_units);
+boolean hud_driver_query_install(struct hud_pane *pane,
+                                 struct pipe_context *pipe, const char *name);
+
+#endif