From 478d1e2c9c73fc29542375c44d01ab964ce8eccf Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 20 Sep 2007 14:08:09 -0600
Subject: remove old/used code

---
 src/mesa/pipe/draw/draw_vertex.c        | 10 +++++-----
 src/mesa/pipe/draw/draw_vertex.h        |  9 ---------
 src/mesa/pipe/draw/draw_vertex_shader.c |  4 ----
 3 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/mesa/pipe/draw')

diff --git a/src/mesa/pipe/draw/draw_vertex.c b/src/mesa/pipe/draw/draw_vertex.c
index ab4e6c7864..6f81e6e8a3 100644
--- a/src/mesa/pipe/draw/draw_vertex.c
+++ b/src/mesa/pipe/draw/draw_vertex.c
@@ -45,7 +45,7 @@
 
 
 static INLINE void
-emit_vertex_attr(struct vertex_info *vinfo, /*uint vfAttr,*/
+emit_vertex_attr(struct vertex_info *vinfo,
                  attrib_format format, interp_mode interp)
 {
    const uint n = vinfo->num_attribs;
@@ -112,15 +112,15 @@ draw_set_vertex_attributes( struct draw_context *draw,
    /*
     * First three attribs are always the same: header, clip pos, winpos
     */
-   emit_vertex_attr(vinfo, /*TGSI_ATTRIB_VERTEX_HEADER,*/ FORMAT_1F, INTERP_NONE);
-   emit_vertex_attr(vinfo, /*TGSI_ATTRIB_CLIP_POS,*/ FORMAT_4F, INTERP_LINEAR);
-   emit_vertex_attr(vinfo, /*TGSI_ATTRIB_POS,*/ FORMAT_4F_VIEWPORT, INTERP_LINEAR);
+   emit_vertex_attr(vinfo, FORMAT_1F, INTERP_NONE);
+   emit_vertex_attr(vinfo, FORMAT_4F, INTERP_LINEAR);
+   emit_vertex_attr(vinfo, FORMAT_4F_VIEWPORT, INTERP_LINEAR);
 
    /*
     * Remaining attribs (color, texcoords, etc)
     */
    for (i = 1; i < nr_attrs; i++) {
-      emit_vertex_attr(vinfo, /*slot_to_vf_attr[i],*/ FORMAT_4F, interps[i]);
+      emit_vertex_attr(vinfo, FORMAT_4F, interps[i]);
    }
 
    draw_compute_vertex_size(vinfo);
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index 5aa0df4e92..2968981708 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -34,15 +34,9 @@
 #define DRAW_VERTEX_H
 
 
-
-#if 0
-#define MAX_VERT_ATTRIBS 12  /* OK? */
-#endif
-
 struct draw_context;
 
 
-
 /**
  * Vertex attribute format
  */
@@ -92,9 +86,6 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
 {
    const uint n = vinfo->num_attribs;
    assert(n < PIPE_MAX_SHADER_OUTPUTS);
-   /*
-   vinfo->attr_mask |= (1 << vfAttr);
-   */
    vinfo->format[n] = format;
    vinfo->interp_mode[n] = interp;
    vinfo->num_attribs++;
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index 2d424632e7..6461e3e3ba 100644
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/mesa/pipe/draw/draw_vertex_shader.c
@@ -94,11 +94,7 @@ run_vertex_program(struct draw_context *draw,
    const float *trans = draw->viewport.translate;
 
    assert(count <= 4);
-#if 0
-   assert(draw->vertex_shader.outputs_written & (1 << TGSI_ATTRIB_POS));
-#else
    assert(draw->vertex_shader.output_semantics[0] == TGSI_SEMANTIC_POSITION);
-#endif
 
 #ifdef DEBUG
    memset( &machine, 0, sizeof( machine ) );
-- 
cgit v1.2.3