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

nir/glsl: Don't allocate a state_slots array for 0 state slots

Browse Source 
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand
2014-12-02 18:07:13 -08:00
parent 9d62df3800
commit 9318ce8c5a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/glsl/nir/glsl_to_nir.cpp
View File

@@ -330,12 +330,18 @@ nir_visitor::visit(ir_variable *ir)
var->data.max_array_access = ir->data.max_array_access;
var->num_state_slots = ir->get_num_state_slots();
var->state_slots = ralloc_array(var, nir_state_slot, var->num_state_slots);
ir_state_slot *state_slots = ir->get_state_slots();
for (unsigned i = 0; i < var->num_state_slots; i++) {
for (unsigned j = 0; j < 5; j++)
var->state_slots[i].tokens[j] = state_slots[i].tokens[j];
var->state_slots[i].swizzle = state_slots[i].swizzle;
if (var->num_state_slots > 0) {
var->state_slots = ralloc_array(var, nir_state_slot,
var->num_state_slots);
ir_state_slot *state_slots = ir->get_state_slots();
for (unsigned i = 0; i < var->num_state_slots; i++) {
for (unsigned j = 0; j < 5; j++)
var->state_slots[i].tokens[j] = state_slots[i].tokens[j];
var->state_slots[i].swizzle = state_slots[i].swizzle;
}
} else {
var->state_slots = NULL;
}
var->constant_value = constant_copy(ir->constant_value, var);