fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 06:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/fs,vec4: Get rid of the sanity_param_count

Browse source 
It doesn't exist for anything other than an assert that, as far as I can
tell, isn't possible to trip.  Soon, we will remove prog from the visitor
entirely and this will become even more impossible to hit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2015-10-01 18:15:21 -07:00
parent ca6a436f12
commit 404419ee1a
5 changed files with 0 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -4985,8 +4985,6 @@ fs_visitor::run_fs(bool do_rep_send)
assert(stage == MESA_SHADER_FRAGMENT);
sanity_param_count = prog->Parameters->NumParameters;
if (devinfo->gen >= 6)
setup_payload_gen6();
else
@ -5055,13 +5053,6 @@ fs_visitor::run_fs(bool do_rep_send)
else
wm_prog_data->reg_blocks_16 = brw_register_blocks(grf_used);
/* If any state parameters were appended, then ParameterValues could have
* been realloced, in which case the driver uniform storage set up by
* _mesa_associate_uniform_storage() would point to freed memory. Make
* sure that didn't happen.
*/
assert(sanity_param_count == prog->Parameters->NumParameters);
return !failed;
}
@ -5071,8 +5062,6 @@ fs_visitor::run_cs()
assert(stage == MESA_SHADER_COMPUTE);
assert(shader);
sanity_param_count = prog->Parameters->NumParameters;
setup_cs_payload();
if (shader_time_index >= 0)
@ -5100,13 +5089,6 @@ fs_visitor::run_cs()
if (failed)
return false;
/* If any state parameters were appended, then ParameterValues could have
* been realloced, in which case the driver uniform storage set up by
* _mesa_associate_uniform_storage() would point to freed memory. Make
* sure that didn't happen.
*/
assert(sanity_param_count == prog->Parameters->NumParameters);
return !failed;
}

1
src/mesa/drivers/dri/i965/brw_fs.h
View file

@ -300,7 +300,6 @@ public:
const struct brw_sampler_prog_key_data *key_tex;
struct brw_stage_prog_data *prog_data;
unsigned int sanity_param_count;
int *param_size;

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

@ -1802,8 +1802,6 @@ vec4_visitor::emit_shader_time_write(int shader_time_subindex, src_reg value)
bool
vec4_visitor::run()
{
sanity_param_count = prog->Parameters->NumParameters;
if (shader_time_index >= 0)
emit_shader_time_begin();
@ -1926,13 +1924,6 @@ vec4_visitor::run()
brw_get_scratch_size(last_scratch * REG_SIZE);
}
/* If any state parameters were appended, then ParameterValues could have
* been realloced, in which case the driver uniform storage set up by
* _mesa_associate_uniform_storage() would point to freed memory. Make
* sure that didn't happen.
*/
assert(sanity_param_count == prog->Parameters->NumParameters);
return !failed;
}

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

@ -97,8 +97,6 @@ public:
const struct brw_sampler_prog_key_data * const key_tex;
struct brw_vue_prog_data * const prog_data;
unsigned int sanity_param_count;
char *fail_msg;
bool failed;

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

@ -1836,7 +1836,6 @@ vec4_visitor::vec4_visitor(const struct brw_compiler *compiler,
shader_prog, prog, &prog_data->base, stage),
key_tex(key_tex),
prog_data(prog_data),
sanity_param_count(0),
fail_msg(NULL),
first_non_payload_grf(0),
need_all_constants_in_pull_buffer(false),