vc4: Use _mesa_hash_table_remove_key() where appropriate.
This commit is contained in:
parent
d8486c2ad7
commit
c74d0e7f62
|
@ -31,13 +31,6 @@
|
|||
#include "vc4_context.h"
|
||||
#include "util/hash_table.h"
|
||||
|
||||
static void
|
||||
remove_from_ht(struct hash_table *ht, void *key)
|
||||
{
|
||||
struct hash_entry *entry = _mesa_hash_table_search(ht, key);
|
||||
_mesa_hash_table_remove(ht, entry);
|
||||
}
|
||||
|
||||
static void
|
||||
vc4_job_free(struct vc4_context *vc4, struct vc4_job *job)
|
||||
{
|
||||
|
@ -46,22 +39,26 @@ vc4_job_free(struct vc4_context *vc4, struct vc4_job *job)
|
|||
vc4_bo_unreference(&referenced_bos[i]);
|
||||
}
|
||||
|
||||
remove_from_ht(vc4->jobs, &job->key);
|
||||
_mesa_hash_table_remove_key(vc4->jobs, &job->key);
|
||||
|
||||
if (job->color_write) {
|
||||
remove_from_ht(vc4->write_jobs, job->color_write->texture);
|
||||
_mesa_hash_table_remove_key(vc4->write_jobs,
|
||||
job->color_write->texture);
|
||||
pipe_surface_reference(&job->color_write, NULL);
|
||||
}
|
||||
if (job->msaa_color_write) {
|
||||
remove_from_ht(vc4->write_jobs, job->msaa_color_write->texture);
|
||||
_mesa_hash_table_remove_key(vc4->write_jobs,
|
||||
job->msaa_color_write->texture);
|
||||
pipe_surface_reference(&job->msaa_color_write, NULL);
|
||||
}
|
||||
if (job->zs_write) {
|
||||
remove_from_ht(vc4->write_jobs, job->zs_write->texture);
|
||||
_mesa_hash_table_remove_key(vc4->write_jobs,
|
||||
job->zs_write->texture);
|
||||
pipe_surface_reference(&job->zs_write, NULL);
|
||||
}
|
||||
if (job->msaa_zs_write) {
|
||||
remove_from_ht(vc4->write_jobs, job->msaa_zs_write->texture);
|
||||
_mesa_hash_table_remove_key(vc4->write_jobs,
|
||||
job->msaa_zs_write->texture);
|
||||
pipe_surface_reference(&job->msaa_zs_write, NULL);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue