From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Mon, 8 Aug 2016 21:53:48 +0000 (-0700)
Subject: anv/pipeline: Add sample locations for gen7-7.5
X-Git-Tag: upstream/17.1.0~7478
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ef5063ad79313d4f81c559e1493cd7e3daf3b6d;p=platform%2Fupstream%2Fmesa.git

anv/pipeline: Add sample locations for gen7-7.5

V1: Add multisample positions (Nanley)
V2: Fix 8x sample positions to match OpenGL (Anuj)
V3: Vulkan has standard sample locations. They need not be same as
    in OpenGL. (Anuj)

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h
index d9d8ca4..64b89cd 100644
--- a/src/intel/vulkan/genX_pipeline_util.h
+++ b/src/intel/vulkan/genX_pipeline_util.h
@@ -475,6 +475,7 @@ emit_ms_state(struct anv_pipeline *pipeline,
    anv_batch_emit(&pipeline->batch, GENX(3DSTATE_MULTISAMPLE), ms) {
       ms.NumberofMultisamples       = log2_samples;
 
+#if GEN_GEN >= 8
       /* The PRM says that this bit is valid only for DX9:
        *
        *    SW can choose to set this bit only for DX9 API. DX10/OGL API's
@@ -482,6 +483,52 @@ emit_ms_state(struct anv_pipeline *pipeline,
        */
       ms.PixelPositionOffsetEnable  = false;
       ms.PixelLocation              = CENTER;
+#else
+      ms.PixelLocation              = PIXLOC_CENTER;
+
+      switch (samples) {
+      case 1:
+         ms.Sample0XOffset          = 0.5;
+         ms.Sample0YOffset          = 0.5;
+         break;
+      case 2:
+         ms.Sample0XOffset          = 0.25;
+         ms.Sample0YOffset          = 0.25;
+         ms.Sample1XOffset          = 0.75;
+         ms.Sample1YOffset          = 0.75;
+         break;
+      case 4:
+         ms.Sample0XOffset          = 0.375;
+         ms.Sample0YOffset          = 0.125;
+         ms.Sample1XOffset          = 0.875;
+         ms.Sample1YOffset          = 0.375;
+         ms.Sample2XOffset          = 0.125;
+         ms.Sample2YOffset          = 0.625;
+         ms.Sample3XOffset          = 0.625;
+         ms.Sample3YOffset          = 0.875;
+         break;
+      case 8:
+         ms.Sample0XOffset          = 0.5625;
+         ms.Sample0YOffset          = 0.3125;
+         ms.Sample1XOffset          = 0.4375;
+         ms.Sample1YOffset          = 0.6875;
+         ms.Sample2XOffset          = 0.8125;
+         ms.Sample2YOffset          = 0.5625;
+         ms.Sample3XOffset          = 0.3125;
+         ms.Sample3YOffset          = 0.1875;
+         ms.Sample4XOffset          = 0.1875;
+         ms.Sample4YOffset          = 0.8125;
+         ms.Sample5XOffset          = 0.0625;
+         ms.Sample5YOffset          = 0.4375;
+         ms.Sample6XOffset          = 0.6875;
+         ms.Sample6YOffset          = 0.9375;
+         ms.Sample7XOffset          = 0.9375;
+         ms.Sample7YOffset          = 0.0625;
+         break;
+      default:
+         break;
+      }
+#endif
    }
 
    anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SAMPLE_MASK), sm) {