diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_cache.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_gs.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vs.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.h | 3 |
8 files changed, 8 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 5725ef6e547..f6293ba8af3 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -794,8 +794,7 @@ struct brw_cache_item { }; -typedef bool (*cache_aux_compare_func)(const void *a, const void *b, - int aux_size, const void *key); +typedef bool (*cache_aux_compare_func)(const void *a, const void *b); typedef void (*cache_aux_free_func)(const void *aux); struct brw_cache { diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index ef32840ad3b..9ccd2bc0008 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -215,9 +215,7 @@ brw_try_upload_using_copy(struct brw_cache *cache, } if (cache->aux_compare[result_item->cache_id]) { - if (!cache->aux_compare[result_item->cache_id](item_aux, aux, - item->aux_size, - item->key)) + if (!cache->aux_compare[result_item->cache_id](item_aux, aux)) continue; } else if (memcmp(item_aux, aux, item->aux_size) != 0) { continue; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_vec4_gs.c index 064e541624d..967e384dfa6 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c @@ -304,8 +304,7 @@ const struct brw_tracked_state brw_gs_prog = { bool -brw_gs_prog_data_compare(const void *in_a, const void *in_b, - int aux_size, const void *in_key) +brw_gs_prog_data_compare(const void *in_a, const void *in_b) { const struct brw_gs_prog_data *a = in_a; const struct brw_gs_prog_data *b = in_b; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.h b/src/mesa/drivers/dri/i965/brw_vec4_gs.h index 82caadc2594..8b979ac55b7 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs.h +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.h @@ -30,8 +30,7 @@ extern "C" { #endif -bool brw_gs_prog_data_compare(const void *a, const void *b, - int aux_size, const void *key); +bool brw_gs_prog_data_compare(const void *a, const void *b); void brw_gs_prog_data_free(const void *in_prog_data); #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index f5bf5905b91..5d4423fb5db 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -176,8 +176,7 @@ gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx) bool -brw_vs_prog_data_compare(const void *in_a, const void *in_b, - int aux_size, const void *in_key) +brw_vs_prog_data_compare(const void *in_a, const void *in_b) { const struct brw_vs_prog_data *a = in_a; const struct brw_vs_prog_data *b = in_b; diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h index 747ba6caa72..5d62e47fea5 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.h +++ b/src/mesa/drivers/dri/i965/brw_vs.h @@ -93,8 +93,7 @@ bool brw_vs_precompile(struct gl_context *ctx, struct gl_shader_program *prog); void brw_vs_debug_recompile(struct brw_context *brw, struct gl_shader_program *prog, const struct brw_vs_prog_key *key); -bool brw_vs_prog_data_compare(const void *a, const void *b, - int aux_size, const void *key); +bool brw_vs_prog_data_compare(const void *a, const void *b); void brw_vs_prog_data_free(const void *in_prog_data); #ifdef __cplusplus diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index ebf6b9cfe6a..f62e297a0e2 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -103,8 +103,7 @@ brw_compute_barycentric_interp_modes(struct brw_context *brw, } bool -brw_wm_prog_data_compare(const void *in_a, const void *in_b, - int aux_size, const void *in_key) +brw_wm_prog_data_compare(const void *in_a, const void *in_b) { const struct brw_wm_prog_data *a = in_a; const struct brw_wm_prog_data *b = in_b; diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h index aa786def463..259a4b67573 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.h +++ b/src/mesa/drivers/dri/i965/brw_wm.h @@ -114,8 +114,7 @@ bool do_wm_prog(struct brw_context *brw, void brw_wm_debug_recompile(struct brw_context *brw, struct gl_shader_program *prog, const struct brw_wm_prog_key *key); -bool brw_wm_prog_data_compare(const void *a, const void *b, - int aux_size, const void *key); +bool brw_wm_prog_data_compare(const void *a, const void *b); void brw_wm_prog_data_free(const void *in_prog_data); #endif |