From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 23 Aug 2016 23:49:08 +0000 (-0700)
Subject: i965/blorp: Remove some i965-isms from genX_blorp_exec.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cea360a7087f9533ce596f052070195254a28c9e;p=mesa.git

i965/blorp: Remove some i965-isms from genX_blorp_exec.h

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/blorp_priv.h b/src/mesa/drivers/dri/i965/blorp_priv.h
index 0144c25f5cb..8487b3e5635 100644
--- a/src/mesa/drivers/dri/i965/blorp_priv.h
+++ b/src/mesa/drivers/dri/i965/blorp_priv.h
@@ -141,7 +141,7 @@ struct brw_blorp_prog_data
     */
    uint32_t flat_inputs;
    unsigned num_varying_inputs;
-   GLbitfield64 inputs_read;
+   uint64_t inputs_read;
 };
 
 static inline unsigned
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.h b/src/mesa/drivers/dri/i965/genX_blorp_exec.h
index 49b9b9dd564..21f6c23f916 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.h
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.h
@@ -209,7 +209,7 @@ blorp_emit_input_varying_data(struct blorp_batch *batch,
    for (unsigned i = 0; i < max_num_varyings; i++) {
       const gl_varying_slot attr = VARYING_SLOT_VAR0 + i;
 
-      if (!(params->wm_prog_data->inputs_read & BITFIELD64_BIT(attr)))
+      if (!(params->wm_prog_data->inputs_read & (1ull << attr)))
          continue;
 
       memcpy(inputs, inputs_src + i * 4, vec4_size_in_bytes);
@@ -415,7 +415,7 @@ blorp_emit_sf_config(struct blorp_batch *batch,
    }
 
    blorp_emit(batch, GENX(3DSTATE_SBE), sbe) {
-      sbe.VertexURBEntryReadOffset = BRW_SF_URB_ENTRY_READ_OFFSET;
+      sbe.VertexURBEntryReadOffset = 1;
       sbe.NumberofSFOutputAttributes = prog_data->num_varying_inputs;
       sbe.VertexURBEntryReadLength = brw_blorp_get_urb_length(prog_data);
       sbe.ForceVertexURBEntryReadLength = true;
@@ -443,7 +443,7 @@ blorp_emit_sf_config(struct blorp_batch *batch,
    }
 
    blorp_emit(batch, GENX(3DSTATE_SBE), sbe) {
-      sbe.VertexURBEntryReadOffset = BRW_SF_URB_ENTRY_READ_OFFSET;
+      sbe.VertexURBEntryReadOffset = 1;
       if (prog_data) {
          sbe.NumberofSFOutputAttributes = prog_data->num_varying_inputs;
          sbe.VertexURBEntryReadLength = brw_blorp_get_urb_length(prog_data);
@@ -463,7 +463,7 @@ blorp_emit_sf_config(struct blorp_batch *batch,
       sf.MultisampleRasterizationMode = params->dst.surf.samples > 1 ?
          MSRASTMODE_ON_PATTERN : MSRASTMODE_OFF_PIXEL;
 
-      sf.VertexURBEntryReadOffset = BRW_SF_URB_ENTRY_READ_OFFSET;
+      sf.VertexURBEntryReadOffset = 1;
       if (prog_data) {
          sf.NumberofSFOutputAttributes = prog_data->num_varying_inputs;
          sf.VertexURBEntryReadLength = brw_blorp_get_urb_length(prog_data);