Merge branch 'master' into gallium-new-formats

Conflicts:
	src/gallium/auxiliary/util/u_format.csv

diff --cc src/gallium/auxiliary/util/u_format.csv
index f55bc3d805b204d836c5e119100cd1ff6acc8fe1,d819bbbde1c373f37a6d2fae32d9e64de45ed842..57e995c03bedbcf680dd2c75147b889c76ab2966
--- 1/src/gallium/auxiliary/util/u_format.csv
--- 2/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@@ -110,30 -108,21 +110,35 @@@ PIPE_FORMAT_UYVY                 , subs
  # XXX: u_tile.c's ycbcr_get_tile_rgba actually interprets it as VYUY but the 
  # intent should be to match D3DFMT_YUY2
  PIPE_FORMAT_YUYV                 , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, yuv
 +# same subsampling but with rgb channels
 +PIPE_FORMAT_R8G8_B8G8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
 +PIPE_FORMAT_G8R8_G8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
 +
 +# some special formats not fitting anywhere else
 +PIPE_FORMAT_R10G10B10A2_USCALED   , plain,      1,  1, u10 , u10 , u10 , u2  , xyzw, rgb
 +PIPE_FORMAT_R11G11B10_FLOAT       , plain,      1,  1, f11 , f11 , f10 ,     , xyz1, rgb
 +PIPE_FORMAT_R9G9B9E5_FLOAT        , compressed, 1,  1, x32 ,     ,     ,     , xyz1, rgb
 +PIPE_FORMAT_R1_UNORM              , compressed, 8,  1, x8  ,     ,     ,     , x001, rgb
  
  # Compressed formats
- PIPE_FORMAT_DXT1_RGB              , compressed, 4, 4, x64 ,     ,     ,     , xyz1, rgb
- PIPE_FORMAT_DXT1_RGBA             , compressed, 4, 4, x64 ,     ,     ,     , xyzw, rgb
- PIPE_FORMAT_DXT3_RGBA             , compressed, 4, 4, x128,     ,     ,     , xyzw, rgb
- PIPE_FORMAT_DXT5_RGBA             , compressed, 4, 4, x128,     ,     ,     , xyzw, rgb
- PIPE_FORMAT_DXT1_SRGB             , compressed, 4, 4, x64 ,     ,     ,     , xyz1, srgb
- PIPE_FORMAT_DXT1_SRGBA            , compressed, 4, 4, x64 ,     ,     ,     , xyzw, srgb
- PIPE_FORMAT_DXT3_SRGBA            , compressed, 4, 4, x128,     ,     ,     , xyzw, srgb
- PIPE_FORMAT_DXT5_SRGBA            , compressed, 4, 4, x128,     ,     ,     , xyzw, srgb
- PIPE_FORMAT_RGTC1_UNORM           , compressed, 4, 4, x64,      ,     ,     , x001, rgb
- PIPE_FORMAT_RGTC1_SNORM           , compressed, 4, 4, x64,      ,     ,     , x001, rgb
- PIPE_FORMAT_RGTC2_UNORM           , compressed, 4, 4, x128,     ,     ,     , xy01, rgb
- PIPE_FORMAT_RGTC2_SNORM           , compressed, 4, 4, x128,     ,     ,     , xy01, rgb
+ # - http://en.wikipedia.org/wiki/S3_Texture_Compression
+ # - http://www.opengl.org/registry/specs/EXT/texture_compression_s3tc.txt
+ # - http://www.opengl.org/registry/specs/ARB/texture_compression_rgtc.txt
+ # - http://msdn.microsoft.com/en-us/library/bb694531.aspx
+ PIPE_FORMAT_DXT1_RGB              , s3tc, 4, 4, x64 ,     ,     ,     , xyz1, rgb
+ PIPE_FORMAT_DXT1_RGBA             , s3tc, 4, 4, x64 ,     ,     ,     , xyzw, rgb
+ PIPE_FORMAT_DXT3_RGBA             , s3tc, 4, 4, x128,     ,     ,     , xyzw, rgb
+ PIPE_FORMAT_DXT5_RGBA             , s3tc, 4, 4, x128,     ,     ,     , xyzw, rgb
+ PIPE_FORMAT_DXT1_SRGB             , s3tc, 4, 4, x64 ,     ,     ,     , xyz1, srgb
+ PIPE_FORMAT_DXT1_SRGBA            , s3tc, 4, 4, x64 ,     ,     ,     , xyzw, srgb
+ PIPE_FORMAT_DXT3_SRGBA            , s3tc, 4, 4, x128,     ,     ,     , xyzw, srgb
+ PIPE_FORMAT_DXT5_SRGBA            , s3tc, 4, 4, x128,     ,     ,     , xyzw, srgb
+ 
++PIPE_FORMAT_RGTC1_UNORM           , rgtc, 4, 4, x64,      ,     ,     , x001, rgb
++PIPE_FORMAT_RGTC1_SNORM           , rgtc, 4, 4, x64,      ,     ,     , x001, rgb
++PIPE_FORMAT_RGTC2_UNORM           , rgtc, 4, 4, x128,     ,     ,     , xy01, rgb
++PIPE_FORMAT_RGTC2_SNORM           , rgtc, 4, 4, x128,     ,     ,     , xy01, rgb
 +
  # Straightforward D3D10-like formats (also used for 
  # vertex buffer element description)
  # 

diff --cc src/gallium/drivers/i965/brw_screen_texture.c
Simple merge

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

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