Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/rtasm/rtasm_execmem.c
	src/mesa/shader/slang/slang_emit.c
	src/mesa/shader/slang/slang_log.c
	src/mesa/state_tracker/st_atom_framebuffer.c

1 files changed, 12 insertions, 0 deletions

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 2c7df7b8d9..237ddaa683 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -233,6 +233,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
+      /* These get generated in the setup routine regardless of the
+       * vertex program:
+       */
+      if (ctx->Point.PointSprite)
+         varying_inputs |= FRAG_BITS_TEX_ANY;
+
       /* First look at what values may be computed by the generated
        * vertex program:
        */
@@ -260,6 +266,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       /* calculate from vp->outputs */
       GLbitfield vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
 
+      /* These get generated in the setup routine regardless of the
+       * vertex program:
+       */
+      if (ctx->Point.PointSprite)
+         vp_outputs |= FRAG_BITS_TEX_ANY;
+
       if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
       if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;