From f626d99edf17a1d3203b257f6fe6993229ea6866 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Tue, 13 Sep 2011 15:14:19 +0200 Subject: [PATCH] nv50/nvc0: add support for R4A4_UNORM and A4R4_UNORM formats R4A4 is needed by OSD in mplayer's xvmc output --- src/gallium/drivers/nv50/nv50_formats.c | 8 ++++++++ src/gallium/drivers/nvc0/nvc0_formats.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/gallium/drivers/nv50/nv50_formats.c b/src/gallium/drivers/nv50/nv50_formats.c index 34502d0a397..4e0e5813260 100644 --- a/src/gallium/drivers/nv50/nv50_formats.c +++ b/src/gallium/drivers/nv50/nv50_formats.c @@ -575,6 +575,14 @@ const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] = B_(C3, C2, C1, C0, UNORM, UNORM, UNORM, UNORM, 8_8_8_8, 0), SAMPLER_VIEW }, + [PIPE_FORMAT_R4A4_UNORM] = { 0, + B_(C0, ZERO, ZERO, C1, UNORM, UNORM, UNORM, UNORM, 4_4, 0), + SAMPLER_VIEW }, + + [PIPE_FORMAT_A4R4_UNORM] = { 0, + B_(C1, ZERO, ZERO, C0, UNORM, UNORM, UNORM, UNORM, 4_4, 0), + SAMPLER_VIEW }, + /* FIXED FORMATS - hw doesn't support these, convert on vbo push for now */ [PIPE_FORMAT_R32G32B32A32_FIXED] = { 0, diff --git a/src/gallium/drivers/nvc0/nvc0_formats.c b/src/gallium/drivers/nvc0/nvc0_formats.c index 8dd4419436d..87d7fd88083 100644 --- a/src/gallium/drivers/nvc0/nvc0_formats.c +++ b/src/gallium/drivers/nvc0/nvc0_formats.c @@ -576,6 +576,14 @@ const struct nvc0_format nvc0_format_table[PIPE_FORMAT_COUNT] = B_(C3, C2, C1, C0, UNORM, UNORM, UNORM, UNORM, 8_8_8_8, 0), SAMPLER_VIEW }, + [PIPE_FORMAT_R4A4_UNORM] = { 0, + B_(C0, ZERO, ZERO, C1, UNORM, UNORM, UNORM, UNORM, 4_4, 0), + SAMPLER_VIEW }, + + [PIPE_FORMAT_A4R4_UNORM] = { 0, + B_(C1, ZERO, ZERO, C0, UNORM, UNORM, UNORM, UNORM, 4_4, 0), + SAMPLER_VIEW }, + /* FIXED FORMATS - hw doesn't support these, convert on vbo push for now */ [PIPE_FORMAT_R32G32B32A32_FIXED] = { 0, -- 2.30.2