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, 10 insertions, 17 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index cac4d86d3a..08fdc54520 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -36,7 +36,6 @@
 #include "intel_context.h"
 #include "brw_structs.h"
 #include "imports.h"
-#include "brw_attrib.h"
 
 
 /* Glossary:
@@ -215,7 +214,7 @@ struct brw_vs_prog_data {
    GLuint total_grf;
    GLuint outputs_written;
 
-   GLuint64EXT inputs_read;
+   GLuint inputs_read;
 
    /* Used for calculating urb partitions:
     */
@@ -382,10 +381,10 @@ struct brw_cached_batch_item {
    
 
 
-/* Protect against a future where BRW_ATTRIB_MAX > 32.  Wouldn't life
+/* Protect against a future where VERT_ATTRIB_MAX > 32.  Wouldn't life
  * be easier if C allowed arrays of packed elements?
  */
-#define ATTRIB_BIT_DWORDS  ((BRW_ATTRIB_MAX+31)/32)
+#define ATTRIB_BIT_DWORDS  ((VERT_ATTRIB_MAX+31)/32)
 
 struct brw_vertex_element {
    const struct gl_client_array *glarray;
@@ -401,8 +400,8 @@ struct brw_vertex_element {
 
 
 struct brw_vertex_info {
-   GLuint64EXT varying;  /* varying:1[BRW_ATTRIB_MAX] */
-   GLuint sizes[ATTRIB_BIT_DWORDS * 2]; /* sizes:2[BRW_ATTRIB_MAX] */
+   GLuint varying;  /* varying:1[VERT_ATTRIB_MAX] */
+   GLuint sizes[ATTRIB_BIT_DWORDS * 2]; /* sizes:2[VERT_ATTRIB_MAX] */
 };
 
 
@@ -449,14 +448,13 @@ struct brw_context
    struct brw_cached_batch_item *cached_batch_items;
 
    struct {
-      /* Fallback values for inputs not supplied: 
-       */
-      struct gl_client_array current_values[BRW_ATTRIB_MAX];
 
       /* Arrays with buffer objects to copy non-bufferobj arrays into
        * for upload:
        */
-      struct gl_client_array vbo_array[BRW_ATTRIB_MAX];
+      struct gl_client_array vbo_array[VERT_ATTRIB_MAX];
+
+      struct brw_vertex_element inputs[VERT_ATTRIB_MAX];
 
 #define BRW_NR_UPLOAD_BUFS 17
 #define BRW_UPLOAD_INIT_SIZE (128*1024)
@@ -469,11 +467,6 @@ struct brw_context
 	 GLuint wrap;
       } upload;
 
-      /* Currenly bound arrays, including fallbacks to current_values
-       * above:
-       */
-      struct brw_vertex_element inputs[BRW_ATTRIB_MAX];
-
       /* Summary of size and varying of active arrays, so we can check
        * for changes to this state:
        */
@@ -505,8 +498,8 @@ struct brw_context
 
    /* Active vertex program: 
     */
-   struct gl_vertex_program *vertex_program;
-   struct gl_fragment_program *fragment_program;
+   const struct gl_vertex_program *vertex_program;
+   const struct gl_fragment_program *fragment_program;
 
 
    /* For populating the gtt: