i965: Track the number of samples in the drawbuffer.

This keeps us from having to emit the nonpipelined state packet on every
FBO binding.

-4.42003% +/- 1.09961% effect on cairo-perf-trace runtime on glamor (n=110).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
index 5d65453..701fda2 100644
--- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
@@ -111,7 +111,8 @@ gen6_determine_sample_mask(struct brw_context *brw)
    float coverage_invert = false;
    unsigned sample_mask = ~0u;
 
-   unsigned num_samples = ctx->DrawBuffer->Visual.samples;
+   /* BRW_NEW_NUM_SAMPLES */
+   unsigned num_samples = brw->num_samples;
 
    if (ctx->Multisample._Enabled) {
       if (ctx->Multisample.SampleCoverage) {
@@ -150,21 +151,17 @@ gen6_emit_3dstate_sample_mask(struct brw_context *brw, unsigned mask)
 
 static void upload_multisample_state(struct brw_context *brw)
 {
-   struct gl_context *ctx = &brw->ctx;
-
-   /* _NEW_BUFFERS, _NEW_MULTISAMPLE */
-   unsigned num_samples = ctx->DrawBuffer->Visual.samples;
-
-   gen6_emit_3dstate_multisample(brw, num_samples);
+   /* BRW_NEW_NUM_SAMPLES */
+   gen6_emit_3dstate_multisample(brw, brw->num_samples);
    gen6_emit_3dstate_sample_mask(brw, gen6_determine_sample_mask(brw));
 }
 
 
 const struct brw_tracked_state gen6_multisample_state = {
    .dirty = {
-      .mesa = _NEW_BUFFERS |
-              _NEW_MULTISAMPLE,
-      .brw = BRW_NEW_CONTEXT,
+      .mesa = _NEW_MULTISAMPLE,
+      .brw = (BRW_NEW_CONTEXT |
+              BRW_NEW_NUM_SAMPLES),
       .cache = 0
    },
    .emit = upload_multisample_state