AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/range_remap: split list node from range entry

Browse Source 
This will allow us to create an array of entries without the
node member in a following patch.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37754>
This commit is contained in:
Timothy Arceri
2025-10-13 12:50:55 +11:00
committed by Marge Bot
parent 754c6d0f54
commit 9536de6eac
4 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/linker_util.cpp
+5 -4
View File
@@ -254,19 +254,20 @@ link_util_update_empty_uniform_locations(const struct gl_constants *consts,
struct gl_shader_program *prog)
{
int prev_end = -1;
list_for_each_entry_safe(struct range_entry, e, &prog->UniformRemapTable->r_list, node) {
list_for_each_entry_safe(struct list_range_entry, e,
&prog->UniformRemapTable->r_list, node) {
unsigned next_slot = prev_end + 1;
if (e->start > next_slot) {
if (e->entry.start > next_slot) {
/* We've found the beginning of a new continous block of empty slots */
struct empty_uniform_block *current_block =
rzalloc(prog, struct empty_uniform_block);
current_block->start = next_slot;
current_block->slots = e->start - next_slot;
current_block->slots = e->entry.start - next_slot;
ir_exec_list_push_tail(&prog->EmptyUniformLocations,
&current_block->link);
}
prev_end = e->end;
prev_end = e->entry.end;
}
/* Add the remaining continous block of empty slots */
src/compiler/glsl/serialize.cpp
+4 -4
View File
@@ -581,8 +581,8 @@ write_uniform_remap_list(struct blob *metadata,
{
blob_write_uint32(metadata, list_length(uniform_remap_list));
list_for_each_entry_safe(struct range_entry, entry, uniform_remap_list, node) {
gl_uniform_storage *u = (gl_uniform_storage *)entry->ptr;
list_for_each_entry_safe(struct list_range_entry, e, uniform_remap_list, node) {
gl_uniform_storage *u = (gl_uniform_storage *)e->entry.ptr;
uint32_t offset = u - uniform_storage;
if (u == INACTIVE_UNIFORM_EXPLICIT_LOCATION) {
@@ -594,8 +594,8 @@ write_uniform_remap_list(struct blob *metadata,
blob_write_uint32(metadata, offset);
}
blob_write_uint32(metadata, entry->start);
blob_write_uint32(metadata, entry->end);
blob_write_uint32(metadata, e->entry.start);
blob_write_uint32(metadata, e->entry.end);
}
}
src/util/u_range_remap.c
+28 -26
View File
@@ -93,19 +93,19 @@ util_range_insert_remap(unsigned start, unsigned end,
struct range_remap *r_remap, void *ptr)
{
struct list_head *r_list = &r_remap->r_list;
struct range_entry *entry = NULL;
struct list_range_entry *lre = NULL;
if (list_is_empty(r_list)) {
entry = rzalloc(r_list, struct range_entry);
list_addtail(&entry->node, r_list);
lre = rzalloc(r_list, struct list_range_entry);
list_addtail(&lre->node, r_list);
goto insert_end;
}
/* Shortcut for consecutive location inserts */
struct range_entry *last_entry =
list_last_entry(r_list, struct range_entry, node);
if (last_entry->end < start) {
entry = rzalloc(r_list, struct range_entry);
list_addtail(&entry->node, r_list);
struct list_range_entry *last_entry =
list_last_entry(r_list, struct list_range_entry, node);
if (last_entry->entry.end < start) {
lre = rzalloc(r_list, struct list_range_entry);
list_addtail(&lre->node, r_list);
goto insert_end;
}
@@ -113,32 +113,34 @@ util_range_insert_remap(unsigned start, unsigned end,
unsigned high = list_length(r_list) - 1;
unsigned mid = (low + high) / 2;
struct range_entry *mid_entry =
list_first_entry(r_list, struct range_entry, node);
struct list_range_entry *mid_entry =
list_first_entry(r_list, struct list_range_entry, node);
unsigned i = 0;
while (i < mid) {
mid_entry = list_entry(mid_entry->node.next, struct range_entry, node);
mid_entry =
list_entry(mid_entry->node.next, struct list_range_entry, node);
i++;
}
while (low <= high) {
if (end < mid_entry->start) {
if (end < mid_entry->entry.start) {
if (low == high || mid == low) {
entry = rzalloc(r_list, struct range_entry);
list_addtail(&entry->node, &mid_entry->node); /* insert before mid */
lre = rzalloc(r_list, struct list_range_entry);
list_addtail(&lre->node, &mid_entry->node); /* insert before mid */
goto insert_end;
}
high = mid - 1;
unsigned new_mid = (low + high) / 2;
while (mid > new_mid) {
mid_entry = list_entry(mid_entry->node.prev, struct range_entry, node);
mid_entry =
list_entry(mid_entry->node.prev, struct list_range_entry, node);
mid--;
}
} else if (start > mid_entry->end) {
} else if (start > mid_entry->entry.end) {
if (low == high || mid == high) {
entry = rzalloc(r_list, struct range_entry);
list_add(&entry->node, &mid_entry->node); /* insert after mid */
lre = rzalloc(r_list, struct list_range_entry);
list_add(&lre->node, &mid_entry->node); /* insert after mid */
goto insert_end;
}
@@ -146,14 +148,14 @@ util_range_insert_remap(unsigned start, unsigned end,
unsigned new_mid = (low + high) / 2;
while (mid < new_mid) {
mid_entry =
list_entry(mid_entry->node.next, struct range_entry, node);
list_entry(mid_entry->node.next, struct list_range_entry, node);
mid++;
}
} else if (mid_entry->start == start && mid_entry->end == end) {
} else if (mid_entry->entry.start == start && mid_entry->entry.end == end) {
if (!ptr)
return mid_entry;
return &mid_entry->entry;
entry = mid_entry;
lre = mid_entry;
goto insert_end;
} else {
/* Attempting to insert an entry that overlaps an existing range */
@@ -162,11 +164,11 @@ util_range_insert_remap(unsigned start, unsigned end,
}
insert_end:
entry->start = start;
entry->end = end;
entry->ptr = ptr;
lre->entry.start = start;
lre->entry.end = end;
lre->entry.ptr = ptr;
return entry;
return &lre->entry;
}
/* Return the range entry that maps to n or NULL if no match found. */
src/util/u_range_remap.h
+5 -2
View File
@@ -33,12 +33,15 @@ struct range_remap {
};
struct range_entry {
struct list_head node;
unsigned start, end;
void *ptr;
};
struct list_range_entry {
struct list_head node;
struct range_entry entry;
};
struct range_entry *
util_range_insert_remap(unsigned start, unsigned end,
struct range_remap *r_remap, void *ptr);