Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

Conflicts:
	src/gallium/include/pipe/p_format.h

diff --cc configure.ac
Simple merge

diff --cc src/gallium/auxiliary/Makefile
Simple merge

diff --cc src/gallium/auxiliary/SConscript
Simple merge

diff --cc src/gallium/auxiliary/util/u_format.csv
Simple merge

diff --cc src/gallium/drivers/r600/Makefile
index 0dc9663de6a33ee6b0075eedfee2d3a96ac857d5,a484f38e9f12fcbf795e35cf8332d612bb699e4d..436de9c4dbde0d46318a59d81402e5f8f804e44d
--- 1/src/gallium/drivers/r600/Makefile
--- 2/src/gallium/drivers/r600/Makefile
+++ b/src/gallium/drivers/r600/Makefile
@@@ -17,9 -17,10 +17,11 @@@ C_SOURCES = 
        r600_shader.c \
        r600_state.c \
        r600_texture.c \
 +      r600_video_context.c \
        r700_asm.c \
        evergreen_state.c \
-       eg_asm.c
+       eg_asm.c \
+       r600_translate.c \
+       r600_state_common.c
  
  include ../../Makefile.template

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

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

diff --cc src/gallium/include/pipe/p_defines.h
Simple merge

diff --cc src/gallium/include/pipe/p_format.h
index 240e349ba7e599e283e7311812196fd395a7548d,22cc7aa18a25fc2f5cb65c646c9b5af0cb6d57ff..119d304d9272f13d74f6ec1870e4d24a9be14a0a
--- 1/src/gallium/include/pipe/p_format.h
--- 2/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@@ -186,18 -186,10 +186,22 @@@ enum pipe_format 
     PIPE_FORMAT_R8G8B8X8_UNORM          = 134,
     PIPE_FORMAT_B4G4R4X4_UNORM          = 135,
  
 -   PIPE_FORMAT_X24S8_USCALED           = 136,
 -   PIPE_FORMAT_S8X24_USCALED           = 137,
 -   PIPE_FORMAT_X32_S8X24_USCALED       = 138,
 +   PIPE_FORMAT_YV12                  = 136,
 +   PIPE_FORMAT_YV16                  = 137,
 +   PIPE_FORMAT_IYUV                  = 138,  /**< aka I420 */
 +   PIPE_FORMAT_NV12                  = 139,
 +   PIPE_FORMAT_NV21                  = 140,
 +   PIPE_FORMAT_AYUV                  = PIPE_FORMAT_A8R8G8B8_UNORM,
 +   PIPE_FORMAT_VUYA                  = PIPE_FORMAT_B8G8R8A8_UNORM,
 +   PIPE_FORMAT_XYUV                  = PIPE_FORMAT_X8R8G8B8_UNORM,
 +   PIPE_FORMAT_VUYX                  = PIPE_FORMAT_B8G8R8X8_UNORM,
 +   PIPE_FORMAT_IA44                  = 141,
 +   PIPE_FORMAT_AI44                  = 142,
 +
+    /* some stencil samplers formats */
++   PIPE_FORMAT_X24S8_USCALED           = 143,
++   PIPE_FORMAT_S8X24_USCALED           = 144,
++   PIPE_FORMAT_X32_S8X24_USCALED       = 145,
     PIPE_FORMAT_COUNT
  };