summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarcin Slusarz <[email protected]>2011-09-13 15:14:19 +0200
committerMarcin Slusarz <[email protected]>2011-09-13 15:28:00 +0200
commitf626d99edf17a1d3203b257f6fe6993229ea6866 (patch)
tree5f8fa4e9b2843fbbef592b80207ea02b8ff16cb0 /src/gallium
parent8dbf9d70d3228f707abc39d8e7db6367638f146b (diff)
nv50/nvc0: add support for R4A4_UNORM and A4R4_UNORM formats
R4A4 is needed by OSD in mplayer's xvmc output
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nv50/nv50_formats.c8
-rw-r--r--src/gallium/drivers/nvc0/nvc0_formats.c8
2 files changed, 16 insertions, 0 deletions
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,