From cd796120c9c9306219efea9e002819ef4c9ee245 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 7 Jun 2019 11:26:20 -0700 Subject: [PATCH] iris: Rename bind_state to bind_shader_state. bind_state is possibly the worst name ever. For create, we used create_shader_state, which is more descriptive. Put shader in the name. --- src/gallium/drivers/iris/iris_program.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index eb049fa..24feb66 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -2173,9 +2173,9 @@ iris_delete_cs_state(struct pipe_context *ctx, void *state) * Updates dirty tracking to account for the shader's NOS. */ static void -bind_state(struct iris_context *ice, - struct iris_uncompiled_shader *ish, - gl_shader_stage stage) +bind_shader_state(struct iris_context *ice, + struct iris_uncompiled_shader *ish, + gl_shader_stage stage) { uint64_t dirty_bit = IRIS_DIRTY_UNCOMPILED_VS << stage; const uint64_t nos = ish ? ish->nos : 0; @@ -2205,13 +2205,13 @@ bind_state(struct iris_context *ice, static void iris_bind_vs_state(struct pipe_context *ctx, void *state) { - bind_state((void *) ctx, state, MESA_SHADER_VERTEX); + bind_shader_state((void *) ctx, state, MESA_SHADER_VERTEX); } static void iris_bind_tcs_state(struct pipe_context *ctx, void *state) { - bind_state((void *) ctx, state, MESA_SHADER_TESS_CTRL); + bind_shader_state((void *) ctx, state, MESA_SHADER_TESS_CTRL); } static void @@ -2223,7 +2223,7 @@ iris_bind_tes_state(struct pipe_context *ctx, void *state) if (!!state != !!ice->shaders.uncompiled[MESA_SHADER_TESS_EVAL]) ice->state.dirty |= IRIS_DIRTY_URB; - bind_state((void *) ctx, state, MESA_SHADER_TESS_EVAL); + bind_shader_state((void *) ctx, state, MESA_SHADER_TESS_EVAL); } static void @@ -2235,7 +2235,7 @@ iris_bind_gs_state(struct pipe_context *ctx, void *state) if (!!state != !!ice->shaders.uncompiled[MESA_SHADER_GEOMETRY]) ice->state.dirty |= IRIS_DIRTY_URB; - bind_state((void *) ctx, state, MESA_SHADER_GEOMETRY); + bind_shader_state((void *) ctx, state, MESA_SHADER_GEOMETRY); } static void @@ -2256,13 +2256,13 @@ iris_bind_fs_state(struct pipe_context *ctx, void *state) (new_ish->nir->info.outputs_written & color_bits)) ice->state.dirty |= IRIS_DIRTY_PS_BLEND; - bind_state((void *) ctx, state, MESA_SHADER_FRAGMENT); + bind_shader_state((void *) ctx, state, MESA_SHADER_FRAGMENT); } static void iris_bind_cs_state(struct pipe_context *ctx, void *state) { - bind_state((void *) ctx, state, MESA_SHADER_COMPUTE); + bind_shader_state((void *) ctx, state, MESA_SHADER_COMPUTE); } void -- 2.7.4