From: Christian König Date: Thu, 28 Oct 2010 18:24:56 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41ed47d6b8fb6c032e2907ef2e49e414c26f35c1;p=mesa.git Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video Conflicts: src/gallium/include/pipe/p_format.h --- 41ed47d6b8fb6c032e2907ef2e49e414c26f35c1 diff --cc src/gallium/drivers/r600/Makefile index 0dc9663de6a,a484f38e9f1..436de9c4dbd --- a/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/include/pipe/p_format.h index 240e349ba7e,22cc7aa18a2..119d304d927 --- a/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_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 = 136, - PIPE_FORMAT_S8X24_USCALED = 137, - PIPE_FORMAT_X32_S8X24_USCALED = 138, ++ PIPE_FORMAT_X24S8_USCALED = 143, ++ PIPE_FORMAT_S8X24_USCALED = 144, ++ PIPE_FORMAT_X32_S8X24_USCALED = 145, PIPE_FORMAT_COUNT };