fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

xserver          commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485
libX11           commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea
glproto          commit aacc7a51b6161c765b04524e0d2ab31e5e586834
fontconfig       commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab
mesa             commit b16b3c8703f198ca0f025b730d582600df79c19c

1 files changed, 17 insertions, 0 deletions

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 8d5bec9c1..5b30fe59b 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -639,6 +639,14 @@ public:
    int binding;
 
    /**
+    * Location an atomic counter is stored at.
+    */
+   struct {
+      unsigned buffer_index;
+      unsigned offset;
+   } atomic;
+
+   /**
     * Built-in state that backs this uniform
     *
     * Once set at variable creation, \c state_slots must remain invariant.
@@ -779,6 +787,12 @@ public:
    /** Whether or not this function signature is a built-in. */
    bool is_builtin() const;
 
+   /**
+    * Whether or not this function is an intrinsic to be implemented
+    * by the driver.
+    */
+   bool is_intrinsic;
+
    /** Whether or not a built-in is available for this shader. */
    bool is_builtin_available(const _mesa_glsl_parse_state *state) const;
 
@@ -2292,6 +2306,9 @@ extern char *
 prototype_string(const glsl_type *return_type, const char *name,
 		 exec_list *parameters);
 
+const char *
+mode_string(const ir_variable *var);
+
 extern "C" {
 #endif /* __cplusplus */