Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_vs_constval.c b/src/mesa/drivers/dri/i965/brw_vs_constval.c
index 502d828397..528e164db8 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_constval.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_constval.c
@@ -162,6 +162,7 @@ static GLuint get_input_size(struct brw_context *brw,
    GLuint sizes_dword = brw->vb.info.sizes[attr/16];
    GLuint sizes_bits = (sizes_dword>>((attr%16)*2)) & 0x3;
    return sizes_bits + 1;
+/*    return brw->vb.inputs[attr].glarray->Size; */
 }
 
 /* Calculate sizes of vertex program outputs.  Size is the largest
@@ -176,8 +177,6 @@ static void calc_wm_input_sizes( struct brw_context *brw )
    struct tracker t;
    GLuint insn;
    GLuint i;
-   GLuint64EXT inputs = brw_translate_inputs(brw->intel.ctx.VertexProgram._Enabled,
-					     vp->program.Base.InputsRead);
 
    memset(&t, 0, sizeof(t));
 
@@ -185,8 +184,8 @@ static void calc_wm_input_sizes( struct brw_context *brw )
    if (brw->attribs.Light->Model.TwoSide)
       t.twoside = 1;
 
-   for (i = 0; i < BRW_ATTRIB_MAX; i++) 
-      if (inputs & (1<<i))
+   for (i = 0; i < VERT_ATTRIB_MAX; i++) 
+      if (vp->program.Base.InputsRead & (1<<i))
 	 set_active_component(&t, PROGRAM_INPUT, i, 
 			      szflag[get_input_size(brw, i)]);