Merge remote-tracking branch 'origin/released'

Conflicts:
	X11/Xfuncproto.h.in
	X11/configure.ac
	X11/keysymdef.h
	freetype/include/freetype/internal/pcftypes.h
	freetype/src/cache/ftcbasic.c
	freetype/src/cache/ftccmap.c
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/state_tracker/st_program.c
	pthreads/Makefile

1 files changed, 4 insertions, 0 deletions

diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index f6c69ac55..926be9aef 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -991,6 +991,7 @@ public:
       assert(callee->return_type != NULL);

       type = callee->return_type;

       actual_parameters->move_nodes_to(& this->actual_parameters);

+      this->use_builtin = callee->is_builtin;

    }

 

    virtual ir_call *clone(void *mem_ctx, struct hash_table *ht) const;

@@ -1054,6 +1055,9 @@ public:
    /* List of ir_rvalue of paramaters passed in this call. */

    exec_list actual_parameters;

 

+   /** Should this call only bind to a built-in function? */

+   bool use_builtin;

+

 private:

    ir_call()

       : callee(NULL)