From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 18 Aug 2009 19:20:36 +0000 (-0700)
Subject: Merge branch 'master' into asm-shader-rework-1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a512985fd81c1ed4ccc5e69aaa05015cf7ff844d;p=mesa.git

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

Conflicts:
	src/mesa/shader/arbprogparse.c
---

a512985fd81c1ed4ccc5e69aaa05015cf7ff844d
diff --cc src/mesa/shader/arbprogparse.c
index 8596aa2eeae,381445c0e84..05ee4f563eb
--- a/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);