Mesa (nv50-compiler): nv50: add signed RGTC1 to format table, allow 2_10_10_10 for vbufs

[Christoph Bumiller]

Module: Mesa
Branch: nv50-compiler
Commit: 28ded2585ca856b67b8cc0dd7c1de000b3fc729b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28ded2585ca856b67b8cc0dd7c1de000b3fc729b

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Mon Jul 26 11:32:27 2010 +0200

nv50: add signed RGTC1 to format table, allow 2_10_10_10 for vbufs

---

 src/gallium/drivers/nv50/nv50_formats.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_formats.c b/src/gallium/drivers/nv50/nv50_formats.c
index 433c74e..e1c7dae 100644
--- a/src/gallium/drivers/nv50/nv50_formats.c
+++ b/src/gallium/drivers/nv50/nv50_formats.c
@@ -86,12 +86,12 @@ const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] =
     SAMPLER_VIEW },
 
    [PIPE_FORMAT_R10G10B10A2_UNORM] = { NV50TCL_RT_FORMAT_A2B10G10R10_UNORM,
-    A_(C0, C1, C2, C3, UNORM, UNORM, UNORM, UNORM, 2_10_10_10, 1),
-    SAMPLER_VIEW | RENDER_TARGET | SCANOUT },
+    A_(C0, C1, C2, C3, UNORM, UNORM, UNORM, UNORM, 2_10_10_10, 0),
+    SAMPLER_VIEW | RENDER_TARGET | VERTEX_BUFFER | SCANOUT },
 
    [PIPE_FORMAT_B10G10R10A2_UNORM] = { NV50TCL_RT_FORMAT_A2R10G10B10_UNORM,
     A_(C2, C1, C0, C3, UNORM, UNORM, UNORM, UNORM, 2_10_10_10, 1),
-    SAMPLER_VIEW | RENDER_TARGET },
+    SAMPLER_VIEW | RENDER_TARGET | VERTEX_BUFFER },
 
    /* DEPTH/STENCIL FORMATS */
 
@@ -168,6 +168,10 @@ const struct nv50_format nv50_format_table[PIPE_FORMAT_COUNT] =
     B_(C0, ZERO, ZERO, ONE, UNORM, UNORM, UNORM, UNORM, RGTC1, 0),
     SAMPLER_VIEW },
 
+   [PIPE_FORMAT_RGTC1_SNORM] = { 0,
+    B_(C0, ZERO, ZERO, ONE, SNORM, SNORM, SNORM, SNORM, RGTC1, 0),
+    SAMPLER_VIEW },
+
    [PIPE_FORMAT_RGTC2_UNORM] = { 0,
     B_(C0, C1, ZERO, ONE, UNORM, UNORM, UNORM, UNORM, RGTC2, 0),
     SAMPLER_VIEW },