summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2011-08-31 09:33:57 -0700
committerPaul Berry <[email protected]>2011-09-06 11:04:59 -0700
commitfc60a07d88e57bc51b153888181d11d3a0ca7d7f (patch)
tree3fdc9fa74fcbd957fa5df4e49bdc903218087152 /src/mesa
parent2d909f431c67d0c8c5075dc40f2901076c5bc48b (diff)
i965: SF: Move outputs_written to a local variable for clarity.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/gen6_sf_state.c5
-rw-r--r--src/mesa/drivers/dri/i965/gen7_sf_state.c5
2 files changed, 6 insertions, 4 deletions
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;