From 404419ee1a57c79982d93eefe4de099d61ad2eee Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 1 Oct 2015 18:15:21 -0700 Subject: [PATCH] i965/fs,vec4: Get rid of the sanity_param_count 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 --- src/mesa/drivers/dri/i965/brw_fs.cpp | 18 ------------------ src/mesa/drivers/dri/i965/brw_fs.h | 1 - src/mesa/drivers/dri/i965/brw_vec4.cpp | 9 --------- src/mesa/drivers/dri/i965/brw_vec4.h | 2 -- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 1 - 5 files changed, 31 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 2e92ef789db..30bb84b846c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -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; } diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 213b2e0de7c..321d302a12a 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -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; diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 52db8ea8cf0..71bb2010f96 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -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; } diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 6e3af60eb82..3095a517fc7 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -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; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index bc9d9a0eff2..f4cbc9e58ed 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -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), -- 2.11.0