Merge remote branch 'origin/master' into pipe-video

diff --cc src/gallium/drivers/r600/r600_asm.c
index d7a7928386f5e77a3c1ed841572c19faa13ba371,d4d8de2fe876cbd962b69e20b4289d8de6c80385..996d9f74a60ce1ea0389854032b961ae8ccdc90f
--- 1/src/gallium/drivers/r600/r600_asm.c
--- 2/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@@ -3080,16 -2152,7 +3037,8 @@@ int r600_vertex_elements_build_fetch_sh
        }
  
        r600_bc_add_cfinst(&bc, BC_INST(&bc, V_SQ_CF_WORD1_SQ_CF_INST_RETURN));
 +      r600_bc_add_cfinst(&bc, BC_INST(&bc, V_SQ_CF_WORD1_SQ_CF_INST_NOP));
  
-       /* use PIPE_BIND_VERTEX_BUFFER so we use the cache buffer manager */
-       ve->fetch_shader = r600_bo(rctx->radeon, bc.ndw*4, 256, PIPE_BIND_VERTEX_BUFFER, 0);
-       if (ve->fetch_shader == NULL) {
-               r600_bc_clear(&bc);
-               return -ENOMEM;
-       }
- 
-       ve->fs_size = bc.ndw*4;
        if ((r = r600_bc_build(&bc))) {
                r600_bc_clear(&bc);
                return r;