From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 13 Jun 2018 16:23:28 +0000 (-0700)
Subject: Revert "intel/compiler: Properly consider UBO loads that cross 32B boundaries."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51376cd74965007b7facf0b86c9d74c678234978;p=mesa.git

Revert "intel/compiler: Properly consider UBO loads that cross 32B boundaries."

This reverts commit b8fa847c2ed9c7c743f31e57560a09fae3992f46.

This broke about 30k Vulkan CTS tests.
---

diff --git a/src/intel/compiler/brw_nir_analyze_ubo_ranges.c b/src/intel/compiler/brw_nir_analyze_ubo_ranges.c
index 6d6ccf73ade..d58fe3dd2e3 100644
--- a/src/intel/compiler/brw_nir_analyze_ubo_ranges.c
+++ b/src/intel/compiler/brw_nir_analyze_ubo_ranges.c
@@ -141,16 +141,10 @@ analyze_ubos_block(struct ubo_analysis_state *state, nir_block *block)
          if (offset >= 64)
             continue;
 
-         /* The value might span multiple 32-byte chunks. */
-         const int bytes = nir_intrinsic_dest_components(intrin) *
-                           (nir_dest_bit_size(intrin->dest) / 8);
-         const int end = DIV_ROUND_UP(offset_const->u32[0] + bytes, 32);
-         const int regs = end - offset + 1;
-
          /* TODO: should we count uses in loops as higher benefit? */
 
          struct ubo_block_info *info = get_block_info(state, block);
-         info->offsets |= ((1ull << regs) - 1) << offset;
+         info->offsets |= 1ull << offset;
          info->uses[offset]++;
       }
    }