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

nir: Set .driver_location for GLSL UBO/SSBOs when we lower to block indices.

Browse Source 
Without this, there's no way to match the UBO nir_variable declarations to
the load_ubo intrinsics referencing their data.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12175>
This commit is contained in:
Emma Anholt
2021-08-02 12:49:56 -07:00
committed by Marge Bot
parent f2c69f8306
commit 01759d3fb2
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/glsl/gl_nir_lower_buffers.c
View File

@@ -39,7 +39,7 @@ get_block_array_index(nir_builder *b, nir_deref_instr *deref,
* blocks later on as well as an optional dynamic index which gets added
* to the block index later.
*/
int binding = 0;
int const_array_offset = 0;
const char *block_name = "";
nir_ssa_def *nonconst_index = NULL;
while (deref->deref_type == nir_deref_type_array) {
@@ -54,7 +54,7 @@ get_block_array_index(nir_builder *b, nir_deref_instr *deref,
block_name = ralloc_asprintf(b->shader, "[%u]%s", arr_index,
block_name);
binding += arr_index * array_elements;
const_array_offset += arr_index * array_elements;
} else {
nir_ssa_def *arr_index = nir_ssa_for_src(b, deref->arr.index, 1);
arr_index = nir_umin(b, arr_index, nir_imm_int(b, arr_size - 1));
@@ -73,7 +73,7 @@ get_block_array_index(nir_builder *b, nir_deref_instr *deref,
}
assert(deref->deref_type == nir_deref_type_var);
binding += deref->var->data.binding;
int binding = const_array_offset + deref->var->data.binding;
block_name = ralloc_asprintf(b->shader, "%s%s",
glsl_get_type_name(deref->var->interface_type),
block_name);
@@ -98,6 +98,7 @@ get_block_array_index(nir_builder *b, nir_deref_instr *deref,
for (unsigned i = 0; i < num_blocks; i++) {
if (( use_bindings && binding == blocks[i]->Binding) ||
(!use_bindings && strcmp(block_name, blocks[i]->Name) == 0)) {
deref->var->data.driver_location = i - const_array_offset;
if (nonconst_index)
return nir_iadd_imm(b, nonconst_index, i);
else
@@ -144,6 +145,7 @@ get_block_index_offset(nir_variable *var,
const char *block_name = glsl_get_type_name(var->interface_type);
if (( use_bindings && blocks[i]->Binding == var->data.binding) ||
(!use_bindings && strcmp(block_name, blocks[i]->Name) == 0)) {
var->data.driver_location = i;
*index = i;
*offset = blocks[i]->Uniforms[var->data.location].Offset;
return;
@@ -329,6 +331,11 @@ gl_nir_lower_buffers(nir_shader *shader,
{
bool progress = false;
nir_foreach_variable_with_modes(var, shader, nir_var_mem_ubo | nir_var_mem_ssbo) {
var->data.driver_location = -1;
progress = true;
}
/* First, we lower the derefs to turn block variable and array derefs into
* a nir_address_format_32bit_index_offset pointer. From there forward,
* we leave the derefs in place and let nir_lower_explicit_io handle them.

3
src/compiler/nir/nir.h
View File

@@ -567,7 +567,8 @@ typedef struct nir_variable {
/**
* The actual location of the variable in the IR. Only valid for inputs,
* outputs, and uniforms (including samplers and images).
* outputs, uniforms (including samplers and images), and for UBO and SSBO
* variables in GLSL.
*/
unsigned driver_location;

2
src/compiler/nir/nir_lower_uniforms_to_ubo.c
View File

@@ -135,6 +135,8 @@ nir_lower_uniforms_to_ubo(nir_shader *shader, bool dword_packed, bool load_vec4)
if (!shader->info.first_ubo_is_default_ubo) {
nir_foreach_variable_with_modes(var, shader, nir_var_mem_ubo) {
var->data.binding++;
if (var->data.driver_location != -1)
var->data.driver_location++;
/* only increment location for ubo arrays */
if (glsl_without_array(var->type) == var->interface_type &&
glsl_type_is_array(var->type))