From: Keith Whitwell <keithw@vmware.com>
Date: Sun, 15 Nov 2009 03:50:45 +0000 (-0800)
Subject: mesa/st: don't calculate unused output_flags data either
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9953fe4cb48b02a0d75735b88173f0ed170a77f2;p=mesa.git

mesa/st: don't calculate unused output_flags data either
---

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 81f02d01e9f..d84832f5392 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -707,8 +707,7 @@ st_translate_mesa_program(
    GLuint numOutputs,
    const GLuint outputMapping[],
    const ubyte outputSemanticName[],
-   const ubyte outputSemanticIndex[],
-   const GLbitfield outputFlags[] )
+   const ubyte outputSemanticIndex[] )
 {
    struct st_translate translate, *t;
    struct ureg_program *ureg;
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index 384831762db..dc0362fe790 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -52,8 +52,7 @@ st_translate_mesa_program(
    GLuint numOutputs,
    const GLuint outputMapping[],
    const ubyte outputSemanticName[],
-   const ubyte outputSemanticIndex[],
-   const GLbitfield outputFlags[] );
+   const ubyte outputSemanticIndex[] );
 
 void
 st_free_tokens(const struct tgsi_token *tokens);
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index fd1b213eb81..5450b59a2d9 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -75,11 +75,6 @@ st_translate_vertex_program(struct st_context *st,
    ubyte vs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
    uint vs_num_outputs = 0;
 
-   GLbitfield output_flags[MAX_PROGRAM_OUTPUTS];
-
-//   memset(&vs, 0, sizeof(vs));
-   memset(output_flags, 0, sizeof(output_flags));
-
    if (stvp->Base.IsPositionInvariant)
       _mesa_insert_mvp_code(st->ctx, &stvp->Base);
 
@@ -115,7 +110,6 @@ st_translate_vertex_program(struct st_context *st,
       assert(i < Elements(vs_output_semantic_name));
       vs_output_semantic_name[i] = TGSI_SEMANTIC_GENERIC;
       vs_output_semantic_index[i] = 0;
-      output_flags[i] = 0x0;
    }
 
    num_generic = 0;
@@ -201,9 +195,6 @@ st_translate_vertex_program(struct st_context *st,
                vs_output_semantic_index[slot] = num_generic++;
             }
          }
-
-         assert(slot < Elements(output_flags));
-         output_flags[slot] = stvp->Base.Base.OutputFlags[attr];
       }
    }
 
@@ -264,8 +255,7 @@ st_translate_vertex_program(struct st_context *st,
                                 vs_num_outputs,
                                 outputMapping,
                                 vs_output_semantic_name,
-                                vs_output_semantic_index,
-                                output_flags );
+                                vs_output_semantic_index );
 
    stvp->num_inputs = vs_num_inputs;
    stvp->driver_shader = pipe->create_vs_state(pipe, &stvp->state);
@@ -309,11 +299,6 @@ st_translate_fragment_program(struct st_context *st,
    ubyte fs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS];
    uint fs_num_outputs = 0;
 
-   GLbitfield output_flags[MAX_PROGRAM_OUTPUTS];
-
-//   memset(&fs, 0, sizeof(fs));
-   memset(output_flags, 0, sizeof(output_flags));
-
    /* which vertex output goes to the first fragment input: */
    if (inputsRead & FRAG_BIT_WPOS)
       vslot = 0;
@@ -420,8 +405,6 @@ st_translate_fragment_program(struct st_context *st,
                break;
             }
 
-            output_flags[fs_num_outputs] = stfp->Base.Base.OutputFlags[attr];
-
             fs_num_outputs++;
          }
       }
@@ -444,8 +427,7 @@ st_translate_fragment_program(struct st_context *st,
                                 fs_num_outputs,
                                 outputMapping,
                                 fs_output_semantic_name,
-                                fs_output_semantic_index,
-                                output_flags );
+                                fs_output_semantic_index );
 
    stfp->driver_shader = pipe->create_fs_state(pipe, &stfp->state);