Merge commit 'origin/perrtblend'

Conflicts:
	src/gallium/drivers/softpipe/sp_screen.c
	src/gallium/include/pipe/p_defines.h

diff --cc src/gallium/auxiliary/util/u_blit.c
Simple merge

diff --cc src/gallium/auxiliary/util/u_gen_mipmap.c
Simple merge

diff --cc src/gallium/drivers/i915/i915_state.c
Simple merge

diff --cc src/gallium/drivers/llvmpipe/lp_bld_blend_soa.c
Simple merge

diff --cc src/gallium/drivers/llvmpipe/lp_state_fs.c
Simple merge

diff --cc src/gallium/drivers/llvmpipe/lp_test_blend.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_screen.c
Simple merge

diff --cc src/gallium/drivers/r300/r300_state.c
Simple merge

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

diff --cc src/gallium/drivers/softpipe/sp_screen.c
index 69f40dc7b64cdf8b50808a01d80cbb20786522db,e36f9ec5dab869ac90d961aa64fc1e3da8d03d0a..b2841f410314c9685d852c48a658bb0b05d1aa33
--- 1/src/gallium/drivers/softpipe/sp_screen.c
--- 2/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@@ -91,10 -91,10 +91,14 @@@ softpipe_get_param(struct pipe_screen *
        return 1;
     case PIPE_CAP_BLEND_EQUATION_SEPARATE:
        return 1;
 +   case PIPE_CAP_MAX_CONST_BUFFERS:
 +      return PIPE_MAX_CONSTANT_BUFFERS;
 +   case PIPE_CAP_MAX_CONST_BUFFER_SIZE:
 +      return 4096 * 4 * sizeof(float);
+    case PIPE_CAP_INDEP_BLEND_ENABLE:
+       return 1;
+    case PIPE_CAP_INDEP_BLEND_FUNC:
+       return 1;
     default:
        return 0;
     }

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

diff --cc src/gallium/include/pipe/p_defines.h
index 353d79a6a7ebb37602752ef37e705f0028823eac,41a4f209019241a9b26dd2457edf185ead90d9a1..b28441dca9c24f05e5a64e02123370ad83d68248
--- 1/src/gallium/include/pipe/p_defines.h
--- 2/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@@ -405,8 -405,8 +405,10 @@@ enum pipe_transfer_usage 
  #define PIPE_CAP_MAX_PREDICATE_REGISTERS 30
  #define PIPE_CAP_MAX_COMBINED_SAMPLERS   31  /*< Maximum texture image units accessible from vertex
                                                   and fragment shaders combined */
 -#define PIPE_CAP_INDEP_BLEND_ENABLE      32  /*< blend enables and write masks per rendertarget */
 -#define PIPE_CAP_INDEP_BLEND_FUNC        33  /*< different blend funcs per rendertarget */
 +#define PIPE_CAP_MAX_CONST_BUFFERS       32
 +#define PIPE_CAP_MAX_CONST_BUFFER_SIZE   33  /*< In bytes */
++#define PIPE_CAP_INDEP_BLEND_ENABLE      34  /*< blend enables and write masks per rendertarget */
++#define PIPE_CAP_INDEP_BLEND_FUNC        35  /*< different blend funcs per rendertarget */
  
  
  /**

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

diff --cc src/gallium/state_trackers/python/tests/regress/fragment-shader/fragment-shader.py
Simple merge

diff --cc src/gallium/state_trackers/python/tests/regress/vertex-shader/vertex-shader.py
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_composite.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_renderer.c
Simple merge

diff --cc src/gallium/state_trackers/xorg/xorg_xv.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_clear.c
Simple merge

diff --cc src/mesa/state_tracker/st_extensions.c
Simple merge