swr: fix build with mingw

[mesa.git] / src / gallium / drivers / r600 / cayman_msaa.c

diff --git a/src/gallium/drivers/r600/cayman_msaa.c b/src/gallium/drivers/r600/cayman_msaa.c
index 33f1040185a8712168a525a995e7b28581c791bb..9f401642b4a4e2c1708c511361122c30c32e1f02 100644 (file)
--- a/src/gallium/drivers/r600/cayman_msaa.c
+++ b/src/gallium/drivers/r600/cayman_msaa.c
@@ -25,6 +25,7 @@
  */
 
 #include "r600_cs.h"
+#include "evergreend.h"
 
 /* 2xMSAA
  * There are two locations (4, 4), (-4, -4). */
@@ -140,7 +141,7 @@ void cayman_init_msaa(struct pipe_context *ctx)
                cayman_get_sample_position(ctx, 16, i, rctx->sample_locations_16x[i]);
 }
 
-void cayman_emit_msaa_sample_locs(struct radeon_winsys_cs *cs, int nr_samples)
+static void cayman_emit_msaa_sample_locs(struct radeon_cmdbuf *cs, int nr_samples)
 {
        switch (nr_samples) {
        default:
@@ -201,9 +202,8 @@ void cayman_emit_msaa_sample_locs(struct radeon_winsys_cs *cs, int nr_samples)
        }
 }
 
-void cayman_emit_msaa_config(struct radeon_winsys_cs *cs, int nr_samples,
-                            int ps_iter_samples, int overrast_samples,
-                            unsigned sc_mode_cntl_1)
+void cayman_emit_msaa_state(struct radeon_cmdbuf *cs, int nr_samples,
+                           int ps_iter_samples, int overrast_samples)
 {
        int setup_samples = nr_samples > 1 ? nr_samples :
                            overrast_samples > 1 ? overrast_samples : 0;
@@ -215,10 +215,17 @@ void cayman_emit_msaa_config(struct radeon_winsys_cs *cs, int nr_samples,
         *       endcaps.
         */
        unsigned sc_line_cntl = S_028BDC_DX10_DIAMOND_TEST_ENA(1);
+       unsigned sc_mode_cntl_1 =
+               EG_S_028A4C_FORCE_EOV_CNTDWN_ENABLE(1) |
+               EG_S_028A4C_FORCE_EOV_REZ_ENABLE(1);
+
+       if (nr_samples > 1) {
+               cayman_emit_msaa_sample_locs(cs, nr_samples);
+       }
 
        if (setup_samples > 1) {
                /* indexed by log2(nr_samples) */
-               unsigned max_dist[] = {
+               const unsigned max_dist[] = {
                        0,
                        eg_max_dist_2x,
                        eg_max_dist_4x,