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

diff --cc src/gallium/drivers/r600/eg_asm.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_asm.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_asm.h
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_shader.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_texture.c
index 4c9d560,3a85a25..048d0b6
--- 1/src/gallium/drivers/r600/r600_texture.c
--- 2/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,

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