From f0afedeb750d9f696242294c730827a28bdaac70 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 20 Jun 2013 12:46:36 +0800 Subject: ilo: use multiple entry points for shader creation Replace ilo_shader_state_create() by ilo_shader_create_vs() ilo_shader_create_gs() ilo_shader_create_fs() ilo_shader_create_cs() Rename ilo_shader_state_destroy() to ilo_shader_destroy(). The old ilo_shader_destroy() is renamed to ilo_shader_destroy_kernel(). --- src/gallium/drivers/ilo/shader/ilo_shader_gs.c | 2 +- src/gallium/drivers/ilo/shader/ilo_shader_internal.h | 2 +- src/gallium/drivers/ilo/shader/ilo_shader_vs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/ilo/shader') diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_gs.c b/src/gallium/drivers/ilo/shader/ilo_shader_gs.c index c4266f41b0c..79a6acb7a28 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_gs.c +++ b/src/gallium/drivers/ilo/shader/ilo_shader_gs.c @@ -1398,7 +1398,7 @@ append_gs_to_vs(struct ilo_shader *vs, struct ilo_shader *gs, int num_verts) vs->gs_offsets[num_verts - 1] = gs_offset; vs->gs_start_grf = gs->in.start_grf; - ilo_shader_destroy(gs); + ilo_shader_destroy_kernel(gs); return true; } diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h index c444e564dab..a73b3393fe3 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_internal.h +++ b/src/gallium/drivers/ilo/shader/ilo_shader_internal.h @@ -203,7 +203,7 @@ ilo_shader_compile_cs(const struct ilo_shader_state *state, const struct ilo_shader_variant *variant); static inline void -ilo_shader_destroy(struct ilo_shader *sh) +ilo_shader_destroy_kernel(struct ilo_shader *sh) { FREE(sh->kernel); FREE(sh); diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_vs.c b/src/gallium/drivers/ilo/shader/ilo_shader_vs.c index fcb9cb53e55..dc166d7cc48 100644 --- a/src/gallium/drivers/ilo/shader/ilo_shader_vs.c +++ b/src/gallium/drivers/ilo/shader/ilo_shader_vs.c @@ -1280,7 +1280,7 @@ ilo_shader_compile_vs(const struct ilo_shader_state *state, if (!ilo_shader_compile_gs_passthrough(state, variant, so_mapping, vcc.shader)) { - ilo_shader_destroy(vcc.shader); + ilo_shader_destroy_kernel(vcc.shader); vcc.shader = NULL; } } -- cgit v1.2.3