OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Get rid of the array elements parameter on load/store intrinsics

Browse Source 
Previously, we used intrinsic->const_index[1] to represent "the number of
array elements to load" for load/store intrinsics.  However, this set to 1
by every pass that ever creates a load/store intrinsic.  Also, while it
might make some sense for registers, it makes no sense whatsoever in SSA.
On top of that, the i965 backend was the only backend to ever support it;
freedreno and vc4 just assert that it's always 1.  Let's just delete it.

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Reviewed-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Jason Ekstrand
2015-05-19 16:57:43 -07:00
parent e1c4e8aaaa
commit 2126c68e5c
6 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/glsl/nir/nir_intrinsics.h
View File

@@ -138,12 +138,11 @@ SYSTEM_VALUE(sample_mask_in, 1)
SYSTEM_VALUE(invocation_id, 1)
/*
* The first index is the address to load from, and the second index is the
* number of array elements to load. Indirect loads have an additional
* register input, which is added to the constant address to compute the
* final address to load from. For UBO's (and SSBO's), the first source is
* the (possibly constant) UBO buffer index and the indirect (if it exists)
* is the second source.
* The first and only index is the base address to load from. Indirect
* loads have an additional register input, which is added to the constant
* address to compute the final address to load from. For UBO's (and
* SSBO's), the first source is the (possibly constant) UBO buffer index
* and the indirect (if it exists) is the second source.
*
* For vector backends, the address is in terms of one vec4, and so each array
* element is +4 scalar components from the previous array element. For scalar
@@ -152,9 +151,9 @@ SYSTEM_VALUE(invocation_id, 1)
*/
#define LOAD(name, extra_srcs, flags) \
INTRINSIC(load_##name, extra_srcs, ARR(1), true, 0, 0, 2, flags) \
INTRINSIC(load_##name, extra_srcs, ARR(1), true, 0, 0, 1, flags) \
INTRINSIC(load_##name##_indirect, extra_srcs + 1, ARR(1, 1), \
true, 0, 0, 2, flags)
true, 0, 0, 1, flags)
LOAD(uniform, 0, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER)
LOAD(ubo, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER)
@@ -172,7 +171,7 @@ LOAD(input, 0, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER)
INTRINSIC(store_##name##_indirect, 2, ARR(0, 1), false, 0, 0, \
num_indices, flags) \
STORE(output, 2, 0)
/* STORE(ssbo, 3, 0) */
STORE(output, 1, 0)
/* STORE(ssbo, 2, 0) */
LAST_INTRINSIC(store_output_indirect)