Merge branch 'master' into instanced-arrays

Conflicts:
	src/gallium/auxiliary/tgsi/tgsi_dump.c
	src/gallium/include/pipe/p_shader_tokens.h

diff --cc src/gallium/auxiliary/draw/draw_context.h
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_private.h
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
Simple merge

diff --cc src/gallium/auxiliary/draw/draw_vs_varient.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_dump.c
index 4391ca7,e2e5394..d7ff262
--- 1/src/gallium/auxiliary/tgsi/tgsi_dump.c
--- 2/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@@ -123,7 -123,7 +123,8 @@@ static const char *semantic_names[] 
     "NORMAL",
     "FACE",
     "EDGEFLAG",
 -   "PRIM_ID"
++   "PRIM_ID",
 +   "INSTANCEID"
  };
  
  static const char *immediate_type_names[] =

diff --cc src/gallium/auxiliary/tgsi/tgsi_ureg.c
Simple merge

diff --cc src/gallium/auxiliary/tgsi/tgsi_ureg.h
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_context.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_draw_arrays.c
index 14cb132,7409c3c..87312ae
--- 1/src/gallium/drivers/softpipe/sp_draw_arrays.c
--- 2/src/gallium/drivers/softpipe/sp_draw_arrays.c
+++ b/src/gallium/drivers/softpipe/sp_draw_arrays.c
@@@ -220,11 -123,13 +230,14 @@@ softpipe_draw_range_elements_instanced(
     struct draw_context *draw = sp->draw;
     unsigned i;
  
+    if (!softpipe_check_render_cond(sp))
+       return TRUE;
+ 
     sp->reduced_api_prim = u_reduced_prim(mode);
  
 -   if (sp->dirty)
 -      softpipe_update_derived( sp );
 +   if (sp->dirty) {
 +      softpipe_update_derived(sp);
 +   }
  
     softpipe_map_transfers(sp);
     softpipe_map_constant_buffers(sp);

diff --cc src/gallium/drivers/softpipe/sp_state.h
Simple merge

diff --cc src/gallium/drivers/svga/svga_state_vs.c
Simple merge

diff --cc src/gallium/include/pipe/p_context.h
Simple merge

diff --cc src/gallium/include/pipe/p_shader_tokens.h
index d791248,550e2ab..b489b04
--- 1/src/gallium/include/pipe/p_shader_tokens.h
--- 2/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@@ -121,17 -121,17 +121,18 @@@ struct tgsi_declaration_rang
     unsigned Last    : 16; /**< UINT */
  };
  
- #define TGSI_SEMANTIC_POSITION 0
- #define TGSI_SEMANTIC_COLOR    1
- #define TGSI_SEMANTIC_BCOLOR   2 /**< back-face color */
- #define TGSI_SEMANTIC_FOG      3
- #define TGSI_SEMANTIC_PSIZE    4
- #define TGSI_SEMANTIC_GENERIC  5
- #define TGSI_SEMANTIC_NORMAL   6
- #define TGSI_SEMANTIC_FACE     7
- #define TGSI_SEMANTIC_EDGEFLAG 8
- #define TGSI_SEMANTIC_INSTANCEID 9
- #define TGSI_SEMANTIC_COUNT      10 /**< number of semantic values */
 -#define TGSI_SEMANTIC_POSITION  0
 -#define TGSI_SEMANTIC_COLOR     1
 -#define TGSI_SEMANTIC_BCOLOR    2 /**< back-face color */
 -#define TGSI_SEMANTIC_FOG       3
 -#define TGSI_SEMANTIC_PSIZE     4
 -#define TGSI_SEMANTIC_GENERIC   5
 -#define TGSI_SEMANTIC_NORMAL    6
 -#define TGSI_SEMANTIC_FACE      7
 -#define TGSI_SEMANTIC_EDGEFLAG  8
 -#define TGSI_SEMANTIC_PRIMID    9
 -#define TGSI_SEMANTIC_COUNT    10 /**< number of semantic values */
++#define TGSI_SEMANTIC_POSITION   0
++#define TGSI_SEMANTIC_COLOR      1
++#define TGSI_SEMANTIC_BCOLOR     2  /**< back-face color */
++#define TGSI_SEMANTIC_FOG        3
++#define TGSI_SEMANTIC_PSIZE      4
++#define TGSI_SEMANTIC_GENERIC    5
++#define TGSI_SEMANTIC_NORMAL     6
++#define TGSI_SEMANTIC_FACE       7
++#define TGSI_SEMANTIC_EDGEFLAG   8
++#define TGSI_SEMANTIC_PRIMID     9
++#define TGSI_SEMANTIC_INSTANCEID 10
++#define TGSI_SEMANTIC_COUNT      11 /**< number of semantic values */
  
  struct tgsi_declaration_semantic
  {