diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-31 15:54:21 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-31 17:05:23 -0700 |
| commit | 24b0c532319b9318e6e5794978c7e1c05e81d76e (patch) | |
| tree | aa32e82042c6e50031c3a07b12235db3d1754579 | |
| parent | f4608bc530e61b7dbc8ebe7eff6ddbc70ac20a9d (diff) | |
nir/intrinsics: Move to a two-dimensional binding model for UBO's
| -rw-r--r-- | src/glsl/nir/nir_intrinsics.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glsl/nir/nir_intrinsics.h b/src/glsl/nir/nir_intrinsics.h index ed309b602c2..1f24f9f677d 100644 --- a/src/glsl/nir/nir_intrinsics.h +++ b/src/glsl/nir/nir_intrinsics.h @@ -145,8 +145,9 @@ SYSTEM_VALUE(invocation_id, 1) * the first index is the base address and the second index is an offset that * should be added to the base address. (This way you can determine in the * back-end which variable is being accessed even in an array.) For inputs, - * the one and only index corresponds to the attribute slot. UBO loads also - * have a single index which is the base address to load from. + * the one and only index corresponds to the attribute slot. UBO loads + * have two indices the first of which is the descriptor set and the second + * is the base address to load from. * * UBO loads have a (possibly constant) source which is the UBO buffer index. * For each type of load, the _indirect variant has one additional source @@ -165,7 +166,7 @@ SYSTEM_VALUE(invocation_id, 1) true, 0, 0, indices, flags) LOAD(uniform, 0, 2, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) -LOAD(ubo, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) +LOAD(ubo, 1, 2, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) LOAD(input, 0, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER) /* LOAD(ssbo, 1, 0) */ |