Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / gallium / drivers / nv50 / nv50_vbo.c

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 1f119501999db20bbae9b8490c365afc6d856101..d41a59d05dbd10e1aa9e689c3ec35664ada40385 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -29,96 +29,6 @@
 #include "nv50_context.h"
 #include "nv50_resource.h"
 
-static INLINE uint32_t
-nv50_vbo_type_to_hw(enum pipe_format format)
-{
-       const struct util_format_description *desc;
-
-       desc = util_format_description(format);
-       assert(desc);
-
-       switch (desc->channel[0].type) {
-       case UTIL_FORMAT_TYPE_FLOAT:
-               return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_FLOAT;
-       case UTIL_FORMAT_TYPE_UNSIGNED:
-               if (desc->channel[0].normalized) {
-                       return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UNORM;
-               }
-               return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_USCALED;
-       case UTIL_FORMAT_TYPE_SIGNED:
-               if (desc->channel[0].normalized) {
-                       return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SNORM;
-               }
-               return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SSCALED;
-       /*
-       case PIPE_FORMAT_TYPE_UINT:
-               return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UINT;
-       case PIPE_FORMAT_TYPE_SINT:
-               return NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SINT; */
-       default:
-               return 0;
-       }
-}
-
-static INLINE uint32_t
-nv50_vbo_size_to_hw(unsigned size, unsigned nr_c)
-{
-       static const uint32_t hw_values[] = {
-               0, 0, 0, 0,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_8,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_8_8,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_8_8_8,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_8_8_8_8,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_16,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_16_16,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_16_16_16,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_16_16_16_16,
-               0, 0, 0, 0,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_32,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_32_32,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_32_32_32,
-               NV50TCL_VERTEX_ARRAY_ATTRIB_FORMAT_32_32_32_32 };
-
-       /* we'd also have R11G11B10 and R10G10B10A2 */
-
-       assert(nr_c > 0 && nr_c <= 4);
-
-       if (size > 32)
-               return 0;
-       size >>= (3 - 2);
-
-       return hw_values[size + (nr_c - 1)];
-}
-
-static INLINE uint32_t
-nv50_vbo_vtxelt_to_hw(struct pipe_vertex_element *ve)
-{
-       uint32_t hw_type, hw_size;
-       enum pipe_format pf = ve->src_format;
-       const struct util_format_description *desc;
-       unsigned size, nr_components;
-
-       desc = util_format_description(pf);
-       assert(desc);
-
-       size = util_format_get_component_bits(pf, UTIL_FORMAT_COLORSPACE_RGB, 0);
-       nr_components = util_format_get_nr_components(pf);
-
-       hw_type = nv50_vbo_type_to_hw(pf);
-       hw_size = nv50_vbo_size_to_hw(size, nr_components);
-
-       if (!hw_type || !hw_size) {
-               NOUVEAU_ERR("unsupported vbo format: %s\n", util_format_name(pf));
-               abort();
-               return 0x24e80000;
-       }
-
-       if (desc->swizzle[0] == UTIL_FORMAT_SWIZZLE_Z) /* BGRA */
-               hw_size |= (1 << 31); /* no real swizzle bits :-( */
-
-       return (hw_type | hw_size);
-}
-
 struct instance {
        struct nouveau_bo *bo;
        unsigned delta;
@@ -533,7 +443,7 @@ nv50_vbo_static_attrib(struct nv50_context *nv50, unsigned attrib,
                so_data  (so, fui(v[1]));
                break;
        case 1:
-               if (attrib == nv50->vertprog->cfg.edgeflag_in) {
+               if (attrib == nv50->vertprog->vp.edgeflag) {
                        so_method(so, tesla, NV50TCL_EDGEFLAG_ENABLE, 1);
                        so_data  (so, v[0] ? 1 : 0);
                }
@@ -554,11 +464,8 @@ nv50_vtxelt_construct(struct nv50_vtxelt_stateobj *cso)
 {
        unsigned i;
 
-       for (i = 0; i < cso->num_elements; ++i) {
-               struct pipe_vertex_element *ve = &cso->pipe[i];
-
-               cso->hw[i] = nv50_vbo_vtxelt_to_hw(ve);
-       }
+       for (i = 0; i < cso->num_elements; ++i)
+               cso->hw[i] = nv50_format_table[cso->pipe[i].src_format].vtx;
 }
 
 struct nouveau_stateobj *
@@ -574,7 +481,7 @@ nv50_vbo_validate(struct nv50_context *nv50)
 
        nv50->vbo_fifo = 0;
        if (nv50->screen->force_push ||
-           nv50->vertprog->cfg.edgeflag_in < 16)
+           nv50->vertprog->vp.edgeflag < 16)
                nv50->vbo_fifo = 0xffff;
 
        for (i = 0; i < nv50->vtxbuf_nr; i++) {