965: remove dead code
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 13 Dec 2007 11:12:44 +0000 (11:12 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 13 Dec 2007 15:37:19 +0000 (15:37 +0000)
src/mesa/pipe/i965simple/Makefile
src/mesa/pipe/i965simple/brw_vs_constval.c [deleted file]

index eda5afaea560f2ffde4b537d8572282158af096b..b0085df65f836b8dd4330abfc3e54dee1b38d5da 100644 (file)
@@ -40,7 +40,6 @@ DRIVER_SOURCES = \
        brw_urb.c \
        brw_util.c \
        brw_vs.c \
-       brw_vs_constval.c \
        brw_vs_emit.c \
        brw_vs_state.c \
        brw_vtbl.c \
diff --git a/src/mesa/pipe/i965simple/brw_vs_constval.c b/src/mesa/pipe/i965simple/brw_vs_constval.c
deleted file mode 100644 (file)
index de43e72..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- Copyright (C) Intel Corp.  2006.  All Rights Reserved.
- Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
- develop this 3D driver.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice (including the
- next paragraph) shall be included in all copies or substantial
- portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- **********************************************************************/
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  */
-
-
-#include "brw_context.h"
-#include "brw_vs.h"
-
-#if 0
-/* Component is active if it may diverge from [0,0,0,1].  Undef values
- * are promoted to [0,0,0,1] for the purposes of this analysis.
- */
-struct tracker {
-   boolean twoside;
-   ubyte active[PROGRAM_OUTPUT+1][128];
-   unsigned size_masks[4];
-};
-
-
-static void set_active_component( struct tracker *t,
-                                 unsigned file,
-                                 unsigned index,
-                                 ubyte active )
-{
-   switch (file) {
-   case PROGRAM_TEMPORARY:
-   case PROGRAM_INPUT:
-   case PROGRAM_OUTPUT:
-      t->active[file][index] |= active;
-
-   default:
-      break;
-   }
-}
-
-static void set_active( struct tracker *t,
-                       struct prog_dst_register dst,
-                       unsigned active )
-{
-   set_active_component( t, dst.File, dst.Index, active & dst.WriteMask );
-}
-
-
-static ubyte get_active_component( struct tracker *t,
-                                    unsigned file,
-                                    unsigned index,
-                                    unsigned component,
-                                    ubyte swz )
-{
-   switch (swz) {
-   case SWIZZLE_ZERO:
-      return component < 3 ? 0 : (1<<component);
-   case SWIZZLE_ONE:
-      return component == 3 ? 0 : (1<<component);
-   default:
-      switch (file) {
-      case PROGRAM_TEMPORARY:
-      case PROGRAM_INPUT:
-      case PROGRAM_OUTPUT:
-        return t->active[file][index] & (1<<component);
-      default:
-        return 1 << component;
-      }
-   }
-}
-
-
-static ubyte get_active( struct tracker *t,
-                          struct prog_src_register src )
-{
-   unsigned i;
-   ubyte active = src.NegateBase; /* NOTE! */
-
-   if (src.RelAddr)
-      return 0xf;
-
-   for (i = 0; i < 4; i++)
-      active |= get_active_component(t, src.File, src.Index, i,
-                                    GET_SWZ(src.Swizzle, i));
-
-   return active;
-}
-
-static ubyte get_output_size( struct tracker *t,
-                               unsigned idx )
-{
-   ubyte active = t->active[PROGRAM_OUTPUT][idx];
-   if (active & (1<<3)) return 4;
-   if (active & (1<<2)) return 3;
-   if (active & (1<<1)) return 2;
-   if (active & (1<<0)) return 1;
-   return 0;
-}
-
-/* Note the potential copying that occurs in the setup program:
- */
-static void calc_sizes( struct tracker *t )
-{
-   unsigned i;
-
-   if (t->twoside) {
-      t->active[PROGRAM_OUTPUT][VERT_RESULT_COL0] |=
-        t->active[PROGRAM_OUTPUT][VERT_RESULT_BFC0];
-
-      t->active[PROGRAM_OUTPUT][VERT_RESULT_COL1] |=
-        t->active[PROGRAM_OUTPUT][VERT_RESULT_BFC1];
-   }
-
-   for (i = 0; i < FRAG_ATTRIB_MAX; i++) {
-      switch (get_output_size(t, i)) {
-      case 4: t->size_masks[4-1] |= 1<<i;
-      case 3: t->size_masks[3-1] |= 1<<i;
-      case 2: t->size_masks[2-1] |= 1<<i;
-      case 1: t->size_masks[1-1] |= 1<<i;
-        break;
-      }
-   }
-}
-
-static ubyte szflag[4+1] = {
-   0,
-   0x1,
-   0x3,
-   0x7,
-   0xf
-};
-
-/* Pull a size out of the packed array:
- */
-static unsigned get_input_size(struct brw_context *brw,
-                            unsigned attr)
-{
-   unsigned sizes_dword = brw->vb.info.sizes[attr/16];
-   unsigned sizes_bits = (sizes_dword>>((attr%16)*2)) & 0x3;
-   return sizes_bits + 1;
-/*    return brw->vb.inputs[attr].glarray->Size; */
-}
-
-/* Calculate sizes of vertex program outputs.  Size is the largest
- * component index which might vary from [0,0,0,1]
- */
-static void calc_wm_input_sizes( struct brw_context *brw )
-{
-   /* BRW_NEW_VERTEX_PROGRAM */
-   struct brw_vertex_program *vp =
-      (struct brw_vertex_program *)brw->vertex_program;
-   /* BRW_NEW_INPUT_DIMENSIONS */
-   struct tracker t;
-   unsigned insn;
-   unsigned i;
-
-   memset(&t, 0, sizeof(t));
-
-   /* _NEW_LIGHT */
-   if (brw->attribs.Light->Model.TwoSide)
-      t.twoside = 1;
-
-   for (i = 0; i < PIPE_ATTRIB_MAX; i++)
-      if (vp->program.Base.InputsRead & (1<<i))
-        set_active_component(&t, PROGRAM_INPUT, i,
-                             szflag[get_input_size(brw, i)]);
-
-   for (insn = 0; insn < vp->program.Base.NumInstructions; insn++) {
-      struct prog_instruction *inst = &vp->program.Base.Instructions[insn];
-
-      switch (inst->Opcode) {
-      case OPCODE_ARL:
-        break;
-
-      case OPCODE_MOV:
-        set_active(&t, inst->DstReg, get_active(&t, inst->SrcReg[0]));
-        break;
-
-      default:
-        set_active(&t, inst->DstReg, 0xf);
-        break;
-      }
-   }
-
-   calc_sizes(&t);
-
-   if (memcmp(brw->wm.input_size_masks, t.size_masks, sizeof(t.size_masks)) != 0) {
-      memcpy(brw->wm.input_size_masks, t.size_masks, sizeof(t.size_masks));
-      brw->state.dirty.brw |= BRW_NEW_WM_INPUT_DIMENSIONS;
-   }
-}
-
-const struct brw_tracked_state brw_wm_input_sizes = {
-   .dirty = {
-      .mesa  = _NEW_LIGHT,
-      .brw   = BRW_NEW_VERTEX_PROGRAM | BRW_NEW_INPUT_DIMENSIONS,
-      .cache = 0
-   },
-   .update = calc_wm_input_sizes
-};
-#endif