nv50: add signed RGTC1 to format table, allow 2_10_10_10 for vbufs
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Mon, 26 Jul 2010 09:32:27 +0000 (11:32 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sat, 31 Jul 2010 16:32:34 +0000 (18:32 +0200)
src/gallium/drivers/nv50/nv50_formats.c

index 433c74e611cc97386133ad2c6c85e8e574abf616..e1c7dae3063b5c55ee6d3b3e6ad393e8e2007449 100644 (file)
@@ -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 },