Merge branch 'master' into asm-shader-rework-1

Conflicts:
	src/mesa/shader/arbprogparse.c

diff --cc src/mesa/shader/arbprogparse.c
index 8596aa2eeae354d0e226d5705b062d0a3bb502e9,381445c0e84f6d0868004c2a459c3c5e999fd011..05ee4f563eb7a2fe8b40bb8c1ab76e03a882da98
--- 1/src/mesa/shader/arbprogparse.c
--- 2/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@@ -127,16 -3975,9 +127,9 @@@ _mesa_parse_arb_fragment_program(GLcont
     if (program->FogOption)
        program->Base.InputsRead |= FRAG_BIT_FOGC;
  
-    /* XXX: assume that ARB fragment programs don't have access to the
-     * FrontFacing and PointCoord values stuffed into the fog
-     * coordinate in GLSL shaders.
-     */
-    if (program->Base.InputsRead & FRAG_BIT_FOGC)
-       program->UsesFogFragCoord = GL_TRUE;
-       
     if (program->Base.Instructions)
        _mesa_free(program->Base.Instructions);
 -   program->Base.Instructions = ap.Base.Instructions;
 +   program->Base.Instructions = prog.Instructions;
  
     if (program->Base.Parameters)
        _mesa_free_parameter_list(program->Base.Parameters);

diff --cc src/mesa/shader/prog_print.c
Simple merge

diff --cc src/mesa/sources.mak
Simple merge