Merge branch 'mesa_7_7_branch'

Conflicts:

	src/mesa/shader/prog_execute.c

diff --cc src/gallium/winsys/xlib/xlib_softpipe.c
Simple merge

diff --cc src/mesa/shader/prog_execute.c
index 7ea792f,fb29768..c212790
--- 1/src/mesa/shader/prog_execute.c
--- 2/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@@ -1667,13 -1655,11 +1689,11 @@@ _mesa_execute_program(GLcontext * ctx
           break;
        case OPCODE_UP2H:        /* unpack two 16-bit floats */
           {
-             GLfloat a[4], result[4];
-             fi_type fi;
-             GLhalfNV hx, hy;
-             fetch_vector1(&inst->SrcReg[0], machine, a);
-             fi.f = a[0];
-             hx = fi.i & 0xffff;
-             hy = fi.i >> 16;
+             const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine);
+             GLfloat result[4];
 -            GLhalfNV hx, hy;
++            GLushort hx, hy;
+             hx = raw & 0xffff;
+             hy = raw >> 16;
              result[0] = result[2] = _mesa_half_to_float(hx);
              result[1] = result[3] = _mesa_half_to_float(hy);
              store_vector4(inst, machine, result);