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

nir/variable: Remove the constant_value field

Browse source 
This was a left-over relic of GLSL IR that we aren't using for anything.
If we ever want that value again, we can add it back, but NIR constant
folding should be just as good as GLSL IR's if not better pretty soon, so
I'm not worried about it.

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-12-19 14:55:45 -08:00
parent 8599b30c67
commit b95fae034f
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/nir/glsl_to_nir.cpp
View file

@ -344,7 +344,6 @@ nir_visitor::visit(ir_variable *ir)
var->state_slots = NULL;
}
var->constant_value = constant_copy(ir->constant_value, var);
var->constant_initializer = constant_copy(ir->constant_initializer, var);
var->interface_type = ir->get_interface_type();
@ -1745,8 +1744,8 @@ nir_visitor::visit(ir_constant *ir)
{
/*
* We don't know if this variable is an an array or struct that gets
* dereferenced, so do the safe thing an make it a variable and return a
* dereference.
* dereferenced, so do the safe thing an make it a variable with a
* constant initializer and return a dereference.
*/
nir_variable *var = ralloc(this->shader, nir_variable);
@ -1754,7 +1753,6 @@ nir_visitor::visit(ir_constant *ir)
var->type = ir->type;
var->data.mode = nir_var_local;
var->data.read_only = true;
var->constant_value = constant_copy(ir, var);
var->constant_initializer = constant_copy(ir, var);
exec_list_push_tail(&this->impl->locals, &var->node);

14
src/glsl/nir/nir.h
View file

@ -200,8 +200,8 @@ typedef struct {
/**
* Was an initial binding explicitly set in the shader?
*
* If so, constant_value contains an integer ir_constant representing the
* initial binding point.
* If so, constant_initializer contains an integer nir_constant
* representing the initial binding point.
*/
unsigned explicit_binding:1;
@ -342,18 +342,8 @@ typedef struct {
nir_state_slot *state_slots; /**< State descriptors. */
/*@}*/
/**
* Value assigned in the initializer of a variable declared "const"
*/
nir_constant *constant_value;
/**
* Constant expression assigned in the initializer of the variable
*
* \warning
* This field and \c ::constant_value are distinct. Even if the two fields
* refer to constants with the same value, they must point to separate
* objects.
*/
nir_constant *constant_initializer;