Re: [Mesa-dev] [PATCH 2/2] genxml: Make BLEND_STATE command support variable length array.

Lionel Landwerlin Sun, 09 Apr 2017 12:18:26 -0700

On 09/04/17 17:23, Jason Ekstrand wrote:

On April 9, 2017 8:48:31 AM Lionel Landwerlin<lionel.g.landwer...@intel.com> wrote:

I have one suggestion at the bottom of the patch, otherwise :

Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>

On 07/04/17 17:52, Rafael Antognolli wrote:

We need to emit BLEND_STATE, which size is 1 + 2 * nr_draw_buffers
dwords (on gen8+), but the BLEND_STATE struct length is always 17. By
marking it size 1, which is actually the size of the struct minus the
BLEND_STATE_ENTRY's, we can emit a BLEND_STATE of variable number of
entries.

For gen6 and gen7 we set length to 0, since it only contains
BLEND_STATE_ENTRY's, and no other data.

With this change, we also change the code for blorp and anv to emitonly

the needed BLEND_STATE_ENTRY's, instead of always emitting 16 dwords on
gen6-7 and 17 dwords on gen8+.

Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com>
---
  src/intel/blorp/blorp_genX_exec.h | 35 ++++++++++++---------
  src/intel/genxml/gen6.xml         |  4 +-
  src/intel/genxml/gen7.xml         |  4 +-
  src/intel/genxml/gen75.xml        |  4 +-
  src/intel/genxml/gen8.xml         |  4 +-
  src/intel/genxml/gen9.xml         |  4 +-

src/intel/vulkan/genX_pipeline.c | 53++++++++++++++++----------------

  7 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/src/intel/blorp/blorp_genX_exec.hb/src/intel/blorp/blorp_genX_exec.h

index 3791462..fc1856f 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -902,23 +902,30 @@ blorp_emit_blend_state(struct blorp_batch *batch,
     struct GENX(BLEND_STATE) blend;
     memset(&blend, 0, sizeof(blend));

+   uint32_t offset;
+   int size = GENX(BLEND_STATE_length) * 4;

+ size += GENX(BLEND_STATE_ENTRY_length) * 4 *params->num_draw_buffers;+ uint32_t *state = blorp_alloc_dynamic_state(batch, size, 64,&offset);

+   uint32_t *pos = state;
+
+   GENX(BLEND_STATE_pack)(NULL, pos, &blend);
+   pos += GENX(BLEND_STATE_length);
+
     for (unsigned i = 0; i < params->num_draw_buffers; ++i) {
-      blend.Entry[i].PreBlendColorClampEnable = true;
-      blend.Entry[i].PostBlendColorClampEnable = true;
-      blend.Entry[i].ColorClampRange = COLORCLAMP_RTFORMAT;
-
-      blend.Entry[i].WriteDisableRed = params->color_write_disable[0];

- blend.Entry[i].WriteDisableGreen =params->color_write_disable[1];- blend.Entry[i].WriteDisableBlue =params->color_write_disable[2];- blend.Entry[i].WriteDisableAlpha =params->color_write_disable[3];

+      struct GENX(BLEND_STATE_ENTRY) entry = { 0 };
+      entry.PreBlendColorClampEnable = true;
+      entry.PostBlendColorClampEnable = true;
+      entry.ColorClampRange = COLORCLAMP_RTFORMAT;
+
+      entry.WriteDisableRed = params->color_write_disable[0];
+      entry.WriteDisableGreen = params->color_write_disable[1];
+      entry.WriteDisableBlue = params->color_write_disable[2];
+      entry.WriteDisableAlpha = params->color_write_disable[3];
+      GENX(BLEND_STATE_ENTRY_pack)(NULL, pos, &entry);
+      pos += GENX(BLEND_STATE_ENTRY_length);
     }

-   uint32_t offset;
-   void *state = blorp_alloc_dynamic_state(batch,
- GENX(BLEND_STATE_length) * 4,
-                                           64, &offset);
-   GENX(BLEND_STATE_pack)(NULL, state, &blend);
-   blorp_flush_range(batch, state, GENX(BLEND_STATE_length) * 4);
+   blorp_flush_range(batch, state, size);

  #if GEN_GEN >= 7
     blorp_emit(batch, GENX(3DSTATE_BLEND_STATE_POINTERS), sp) {
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 5083f07..3059bfc 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -452,8 +452,8 @@

<field name="Post-Blend Color Clamp Enable" start="32"end="32" type="bool"/>

    </struct>

-  <struct name="BLEND_STATE" length="16">
-    <group count="8" start="0" size="64">
+  <struct name="BLEND_STATE" length="0">
+    <group count="0" start="0" size="64">