nv50/nvc0: add support for R4A4_UNORM and A4R4_UNORM formats

R4A4 is needed by OSD in mplayer's xvmc output

diff --git a/src/gallium/drivers/nv50/nv50_formats.c b/src/gallium/drivers/nv50/nv50_formats.c
index 34502d0a39744db82b41eadcbbf17e4ec33be2a0..4e0e581326094a1038315735a6a541bb8090ac2f 100644 (file)
--- 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 8dd4419436deac6076b4d245357929241bc0324c..87d7fd8808305526daf90582ed6b800b373a9689 100644 (file)
--- 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,