From: Christian König <deathsimple@vodafone.de>
Date: Mon, 28 Feb 2011 22:59:53 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b97e41c7b18c363a303693fb841fe606b1106fe6;p=mesa.git

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

b97e41c7b18c363a303693fb841fe606b1106fe6
diff --cc src/gallium/drivers/r600/r600_texture.c
index 4c9d5609c06,3a85a25065a..048d0b61e3b
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@@ -292,9 -292,9 +292,9 @@@ static boolean permit_hardware_blit(str
  		bind = PIPE_BIND_RENDER_TARGET;
  
  	/* hackaround for S3TC */
- 	if (util_format_is_s3tc(res->format))
+ 	if (util_format_is_compressed(res->format))
  		return TRUE;
 -	    
 +
  	if (!screen->is_format_supported(screen,
  				res->format,
  				res->target,