From: Christian König <deathsimple@vodafone.de>
Date: Sat, 5 Mar 2011 14:46:56 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Tag: 062012170305~4979^2~230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=199034a3cc46e09e7a325690ac5b2b097e90249f;p=profile%2Fivi%2Fmesa.git

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

199034a3cc46e09e7a325690ac5b2b097e90249f
diff --cc src/gallium/drivers/r600/r600_asm.c
index d7a7928,d4d8de2..996d9f7
--- a/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;