From: Paul Berry <stereotype441@gmail.com>
Date: Wed, 31 Aug 2011 16:33:57 +0000 (-0700)
Subject: i965: SF: Move outputs_written to a local variable for clarity.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc60a07d88e57bc51b153888181d11d3a0ca7d7f;p=mesa.git

i965: SF: Move outputs_written to a local variable for clarity.

Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index 88672798740..933686845a2 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -105,7 +105,8 @@ upload_sf_state(struct brw_context *brw)
    struct gl_context *ctx = &intel->ctx;
    struct brw_vue_map vue_map;
    /* CACHE_NEW_VS_PROG */
-   uint32_t num_inputs = brw_count_bits(brw->vs.prog_data->outputs_written);
+   GLbitfield64 vs_outputs_written = brw->vs.prog_data->outputs_written;
+   uint32_t num_inputs = brw_count_bits(vs_outputs_written);
    /* BRW_NEW_FRAGMENT_PROGRAM */
    uint32_t num_outputs = brw_count_bits(brw->fragment_program->Base.InputsRead);
    uint32_t dw1, dw2, dw3, dw4, dw16, dw17;
@@ -255,7 +256,7 @@ upload_sf_state(struct brw_context *brw)
     * they source from.
     */
    brw_compute_vue_map(&vue_map, intel, nr_userclip, two_side_color,
-                       brw->vs.prog_data->outputs_written);
+                       vs_outputs_written);
    for (; attr < FRAG_ATTRIB_MAX; attr++) {
       if (!(brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr)))
 	 continue;
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c
index 4d1a2aa8684..a1bd2abe4e9 100644
--- a/src/mesa/drivers/dri/i965/gen7_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c
@@ -35,7 +35,8 @@ upload_sbe_state(struct brw_context *brw)
    struct gl_context *ctx = &intel->ctx;
    struct brw_vue_map vue_map;
    /* CACHE_NEW_VS_PROG */
-   uint32_t num_inputs = brw_count_bits(brw->vs.prog_data->outputs_written);
+   GLbitfield64 vs_outputs_written = brw->vs.prog_data->outputs_written;
+   uint32_t num_inputs = brw_count_bits(vs_outputs_written);
    /* BRW_NEW_FRAGMENT_PROGRAM */
    uint32_t num_outputs = brw_count_bits(brw->fragment_program->Base.InputsRead);
    uint32_t dw1, dw10, dw11;
@@ -73,7 +74,7 @@ upload_sbe_state(struct brw_context *brw)
     * they source from.
     */
    brw_compute_vue_map(&vue_map, intel, nr_userclip, two_side_color,
-                       brw->vs.prog_data->outputs_written);
+                       vs_outputs_written);
    for (; attr < FRAG_ATTRIB_MAX; attr++) {
       if (!(brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr)))
 	 continue;