fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 18:10:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/vec4: Get rid of the uniform_size array

Browse source
This commit is contained in:
Jason Ekstrand 2015-12-08 17:02:16 -08:00
parent eb76f226cf
commit 75f33a6420
5 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/brw_vec4.cpp
View file

@ -466,11 +466,6 @@ vec4_visitor::split_uniform_registers()
inst->src[i].reg_offset = 0;
}
}
/* Update that everything is now vector-sized. */
for (int i = 0; i < this->uniforms; i++) {
this->uniform_size[i] = 1;
}
}
void
@ -528,7 +523,6 @@ vec4_visitor::pack_uniform_registers()
* push constants.
*/
for (int src = 0; src < uniforms; src++) {
assert(src < uniform_array_size);
int size = chans_used[src];
if (size == 0)
@ -1588,8 +1582,6 @@ vec4_visitor::setup_uniforms(int reg)
* matter what, or the GPU would hang.
*/
if (devinfo->gen < 6 && this->uniforms == 0) {
assert(this->uniforms < this->uniform_array_size);
stage_prog_data->param =
reralloc(NULL, stage_prog_data->param, const gl_constant_value *, 4);
for (unsigned int i = 0; i < 4; i++) {

2
src/mesa/drivers/dri/i965/brw_vec4.h
View file

@ -115,8 +115,6 @@ public:
*/
dst_reg output_reg[BRW_VARYING_SLOT_COUNT];
const char *output_reg_annotation[BRW_VARYING_SLOT_COUNT];
int *uniform_size;
int uniform_array_size; /*< Size of the uniform_size array */
int uniforms;
src_reg shader_start_time;

9
src/mesa/drivers/dri/i965/brw_vec4_nir.cpp
View file

@ -118,15 +118,6 @@ void
vec4_visitor::nir_setup_uniforms()
{
uniforms = nir->num_uniforms / 16;
nir_foreach_variable(var, &nir->uniforms) {
/* UBO's and atomics don't take up space in the uniform file */
if (var->interface_type != NULL || var->type->contains_atomic())
continue;
if (type_size_vec4(var->type) > 0)
uniform_size[var->data.driver_location / 16] = type_size_vec4(var->type);
}
}
void

11
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -1786,17 +1786,6 @@ vec4_visitor::vec4_visitor(const struct brw_compiler *compiler,
this->max_grf = devinfo->gen >= 7 ? GEN7_MRF_HACK_START : BRW_MAX_GRF;
this->uniforms = 0;
/* Initialize uniform_array_size to at least 1 because pre-gen6 VS requires
* at least one. See setup_uniforms() in brw_vec4.cpp.
*/
this->uniform_array_size = 1;
if (prog_data) {
this->uniform_array_size =
MAX2(DIV_ROUND_UP(stage_prog_data->nr_params, 4), 1);
}
this->uniform_size = rzalloc_array(mem_ctx, int, this->uniform_array_size);
}
vec4_visitor::~vec4_visitor()

1
src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp
View file

@ -261,7 +261,6 @@ void
vec4_vs_visitor::setup_uniform_clipplane_values()
{
for (int i = 0; i < key->nr_userclip_plane_consts; ++i) {
assert(this->uniforms < uniform_array_size);
this->userplane[i] = dst_reg(UNIFORM, this->uniforms);
this->userplane[i].type = BRW_REGISTER_TYPE_F;
for (int j = 0; j < 4; ++j) {