Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 73 insertions, 5 deletions

diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index adb88706f..397164cde 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -134,6 +134,8 @@ match_function_by_name(exec_list *instructions, const char *name,
       }

    }

 

+   exec_list post_call_conversions;

+

    if (sig != NULL) {

       /* Verify that 'out' and 'inout' actual parameters are lvalues.  This

        * isn't done in ir_function::matching_signature because that function

@@ -141,6 +143,12 @@ match_function_by_name(exec_list *instructions, const char *name,
        *

        * Also, validate that 'const_in' formal parameters (an extension of our

        * IR) correspond to ir_constant actual parameters.

+       *

+       * Also, perform implicit conversion of arguments.  Note: to implicitly

+       * convert out parameters, we need to place them in a temporary

+       * variable, and do the conversion after the call takes place.  Since we

+       * haven't emitted the call yet, we'll place the post-call conversions

+       * in a temporary exec_list, and emit them later.

        */

       exec_list_iterator actual_iter = actual_parameters->iterator();

       exec_list_iterator formal_iter = sig->parameters.iterator();

@@ -156,6 +164,7 @@ match_function_by_name(exec_list *instructions, const char *name,
 	    _mesa_glsl_error(loc, state,

 			     "parameter `%s' must be a constant expression",

 			     formal->name);

+	    return ir_call::get_error_instruction(ctx);

 	 }

 

 	 if ((formal->mode == ir_var_out)

@@ -185,8 +194,64 @@ match_function_by_name(exec_list *instructions, const char *name,
 	 }

 

 	 if (formal->type->is_numeric() || formal->type->is_boolean()) {

-	    ir_rvalue *converted = convert_component(actual, formal->type);

-	    actual->replace_with(converted);

+            switch (formal->mode) {

+            case ir_var_const_in:

+            case ir_var_in: {

+               ir_rvalue *converted

+                  = convert_component(actual, formal->type);

+               actual->replace_with(converted);

+               break;

+            }

+            case ir_var_out:

+               if (actual->type != formal->type) {

+                  /* To convert an out parameter, we need to create a

+                   * temporary variable to hold the value before conversion,

+                   * and then perform the conversion after the function call

+                   * returns.

+                   *

+                   * This has the effect of transforming code like this:

+                   *

+                   *   void f(out int x);

+                   *   float value;

+                   *   f(value);

+                   *

+                   * Into IR that's equivalent to this:

+                   *

+                   *   void f(out int x);

+                   *   float value;

+                   *   int out_parameter_conversion;

+                   *   f(out_parameter_conversion);

+                   *   value = float(out_parameter_conversion);

+                   */

+                  ir_variable *tmp =

+                     new(ctx) ir_variable(formal->type,

+                                          "out_parameter_conversion",

+                                          ir_var_temporary);

+                  instructions->push_tail(tmp);

+                  ir_dereference_variable *deref_tmp_1

+                     = new(ctx) ir_dereference_variable(tmp);

+                  ir_dereference_variable *deref_tmp_2

+                     = new(ctx) ir_dereference_variable(tmp);

+                  ir_rvalue *converted_tmp

+                     = convert_component(deref_tmp_1, actual->type);

+                  ir_assignment *assignment

+                     = new(ctx) ir_assignment(actual, converted_tmp);

+                  post_call_conversions.push_tail(assignment);

+                  actual->replace_with(deref_tmp_2);

+               }

+               break;

+            case ir_var_inout:

+               /* Inout parameters should never require conversion, since that

+                * would require an implicit conversion to exist both to and

+                * from the formal parameter type, and there are no

+                * bidirectional implicit conversions.

+                */

+               assert (actual->type == formal->type);

+               break;

+            default:

+               assert (!"Illegal formal parameter mode");

+               break;

+            }

 	 }

 

 	 actual_iter.next();

@@ -196,8 +261,11 @@ match_function_by_name(exec_list *instructions, const char *name,
       /* Always insert the call in the instruction stream, and return a deref

        * of its return val if it returns a value, since we don't know if

        * the rvalue is going to be assigned to anything or not.

+       *

+       * Also insert any out parameter conversions after the call.

        */

       ir_call *call = new(ctx) ir_call(sig, actual_parameters);

+      ir_dereference_variable *deref;

       if (!sig->return_type->is_void()) {

          /* If the function call is a constant expression, don't

           * generate the instructions to call it; just generate an

@@ -214,7 +282,6 @@ match_function_by_name(exec_list *instructions, const char *name,
          }

 

 	 ir_variable *var;

-	 ir_dereference_variable *deref;

 

 	 var = new(ctx) ir_variable(sig->return_type,

 				    ralloc_asprintf(ctx, "%s_retval",

@@ -227,11 +294,12 @@ match_function_by_name(exec_list *instructions, const char *name,
 	 instructions->push_tail(assign);

 

 	 deref = new(ctx) ir_dereference_variable(var);

-	 return deref;

       } else {

 	 instructions->push_tail(call);

-	 return NULL;

+	 deref = NULL;

       }

+      instructions->append_list(&post_call_conversions);

+      return deref;

    } else {

       char *str = prototype_string(NULL, name, actual_parameters);