fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 11:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/inline_uniforms: Allow possibility of more than one UBO

Browse source 
Only caller in this file still only passes 1.

This is step 2 in an attempt to unify a bunch of nir_inline_uniforms.c
and lvp_inline_uniforms.c code.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21179>
This commit is contained in:
Ian Romanick 2023-02-06 11:25:19 -08:00 • committed by Marge Bot
parent 23b4266f9e
commit 0c0fb216dd
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/compiler/nir/nir_inline_uniforms.c
View file

@ -46,7 +46,7 @@
/* Maximum value in shader_info::inlinable_uniform_dw_offsets[] */ /* Maximum value in shader_info::inlinable_uniform_dw_offsets[] */
#define MAX_OFFSET (UINT16_MAX * 4) #define MAX_OFFSET (UINT16_MAX * 4)
#define MAX_NUM_BO 1 #define MAX_NUM_BO 32
static bool static bool
src_only_uses_uniforms(const nir_src *src, int component, src_only_uses_uniforms(const nir_src *src, int component,
@ -116,18 +116,20 @@ src_only_uses_uniforms(const nir_src *src, int component,
uint32_t offset = nir_src_as_uint(intr->src[1]) + component * 4; uint32_t offset = nir_src_as_uint(intr->src[1]) + component * 4;
assert(offset < MAX_OFFSET); assert(offset < MAX_OFFSET);
const unsigned ubo = nir_src_as_uint(intr->src[0]);
/* Already recorded by other one */ /* Already recorded by other one */
for (int i = 0; i < *num_offsets; i++) { for (int i = 0; i < num_offsets[ubo]; i++) {
if (uni_offsets[i] == offset) if (uni_offsets[ubo * MAX_NUM_BO + i] == offset)
return true; return true;
} }
/* Exceed uniform number limit */ /* Exceed uniform number limit */
if (*num_offsets == MAX_INLINABLE_UNIFORMS) if (num_offsets[ubo] == MAX_INLINABLE_UNIFORMS)
return false; return false;
/* Record the uniform offset. */ /* Record the uniform offset. */
uni_offsets[(*num_offsets)++] = offset; uni_offsets[ubo * MAX_NUM_BO + num_offsets[ubo]++] = offset;
return true; return true;
} }
return false; return false;
@ -196,7 +198,9 @@ add_inlinable_uniforms(const nir_src *cond, nir_loop_info *info,
uint32_t *uni_offsets, uint8_t *num_offsets, uint32_t *uni_offsets, uint8_t *num_offsets,
unsigned max_num_bo, unsigned max_offset) unsigned max_num_bo, unsigned max_offset)
{ {
uint8_t new_num = *num_offsets; uint8_t new_num[MAX_NUM_BO];
memcpy(new_num, num_offsets, sizeof(new_num));
/* If condition SSA is always scalar, so component is 0. */ /* If condition SSA is always scalar, so component is 0. */
unsigned component = 0; unsigned component = 0;
@ -215,7 +219,7 @@ add_inlinable_uniforms(const nir_src *cond, nir_loop_info *info,
*/ */
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (is_induction_variable(&alu->src[i].src, alu->src[i].swizzle[0], if (is_induction_variable(&alu->src[i].src, alu->src[i].swizzle[0],
info, uni_offsets, &new_num, info, uni_offsets, new_num,
max_num_bo, max_offset)) { max_num_bo, max_offset)) {
cond = &alu->src[1 - i].src; cond = &alu->src[1 - i].src;
component = alu->src[1 - i].swizzle[0]; component = alu->src[1 - i].swizzle[0];
@ -245,9 +249,9 @@ add_inlinable_uniforms(const nir_src *cond, nir_loop_info *info,
* unless uniform0, uniform1 and uniform2 can be inlined at once, * unless uniform0, uniform1 and uniform2 can be inlined at once,
* can the loop be unrolled. * can the loop be unrolled.
*/ */
if (src_only_uses_uniforms(cond, component, uni_offsets, &new_num, if (src_only_uses_uniforms(cond, component, uni_offsets, new_num,
max_num_bo, max_offset)) max_num_bo, max_offset))
*num_offsets = new_num; memcpy(num_offsets, new_num, sizeof(new_num[0]) * max_num_bo);
} }
static void static void