i965/eu: Take into account the target cache argument in brw_set_dp_read_message.

[mesa.git] / src / mesa / drivers / dri / i965 / gen8_multisample_state.c

diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
index ad273e4d42408867bc04674d36b1fe6b574d1e4e..e36d037d471dee2103374fd16cd5455583e2da12 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
@@ -33,33 +33,13 @@
 void
 gen8_emit_3dstate_multisample(struct brw_context *brw, unsigned num_samples)
 {
-   uint32_t number_of_multisamples = 0;
+   assert(num_samples <= 16);
 
-   switch (num_samples) {
-   case 0:
-   case 1:
-      number_of_multisamples = MS_NUMSAMPLES_1;
-      break;
-   case 2:
-      number_of_multisamples = MS_NUMSAMPLES_2;
-      break;
-   case 4:
-      number_of_multisamples = MS_NUMSAMPLES_4;
-      break;
-   case 8:
-      number_of_multisamples = MS_NUMSAMPLES_8;
-      break;
-   case 16:
-      number_of_multisamples = MS_NUMSAMPLES_16;
-      break;
-   default:
-      assert(!"Unrecognized num_samples in gen8_emit_3dstate_multisample");
-      break;
-   }
+   unsigned log2_samples = ffs(MAX2(num_samples, 1)) - 1;
 
    BEGIN_BATCH(2);
    OUT_BATCH(GEN8_3DSTATE_MULTISAMPLE << 16 | (2 - 2));
-   OUT_BATCH(MS_PIXEL_LOCATION_CENTER | number_of_multisamples);
+   OUT_BATCH(MS_PIXEL_LOCATION_CENTER | log2_samples << 1);
    ADVANCE_BATCH();
 }
 
@@ -72,25 +52,21 @@ gen8_emit_3dstate_sample_pattern(struct brw_context *brw)
    BEGIN_BATCH(9);
    OUT_BATCH(_3DSTATE_SAMPLE_PATTERN << 16 | (9 - 2));
 
-   /* 16x MSAA
-    * XXX: Need to program these.
-    */
-   OUT_BATCH(0);
-   OUT_BATCH(0);
-   OUT_BATCH(0);
-   OUT_BATCH(0);
+   /* 16x MSAA */
+   OUT_BATCH(brw_multisample_positions_16x[0]); /* positions  3,  2,  1,  0 */
+   OUT_BATCH(brw_multisample_positions_16x[1]); /* positions  7,  6,  5,  4 */
+   OUT_BATCH(brw_multisample_positions_16x[2]); /* positions 11, 10,  9,  8 */
+   OUT_BATCH(brw_multisample_positions_16x[3]); /* positions 15, 14, 13, 12 */
 
    /* 8x MSAA */
    OUT_BATCH(brw_multisample_positions_8x[1]); /* sample positions 7654 */
    OUT_BATCH(brw_multisample_positions_8x[0]); /* sample positions 3210 */
 
    /* 4x MSAA */
-   OUT_BATCH(brw_multisample_positions_4x[0]);
+   OUT_BATCH(brw_multisample_positions_4x);
 
-   /* 2x and 1x MSAA patterns
-    * XXX: need to program 2x.
-    */
-   OUT_BATCH(0x00880000);
+   /* 1x and 2x MSAA */
+   OUT_BATCH(brw_multisample_positions_1x_2x);
    ADVANCE_BATCH();
 }
 
@@ -98,20 +74,16 @@ gen8_emit_3dstate_sample_pattern(struct brw_context *brw)
 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;
-
-   gen8_emit_3dstate_multisample(brw, num_samples);
+   gen8_emit_3dstate_multisample(brw, brw->num_samples);
    gen6_emit_3dstate_sample_mask(brw, gen6_determine_sample_mask(brw));
 }
 
 const struct brw_tracked_state gen8_multisample_state = {
    .dirty = {
-      .mesa = _NEW_BUFFERS | _NEW_MULTISAMPLE,
-      .brw = BRW_NEW_CONTEXT,
-      .cache = 0
+      .mesa = _NEW_MULTISAMPLE,
+      .brw = BRW_NEW_BLORP |
+             BRW_NEW_CONTEXT |
+             BRW_NEW_NUM_SAMPLES,
    },
    .emit = upload_multisample_state
 };