From 8d7eda9c9558593e9900eed0b5edc7a106664028 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 12 Feb 2021 16:59:59 +0100 Subject: [PATCH] panfrost: Prefix shader related helpers with pan_shader_ Signed-off-by: Boris Brezillon Acked-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_assemble.c | 2 +- src/gallium/drivers/panfrost/pan_blend_shaders.c | 2 +- src/gallium/drivers/panfrost/pan_compute.c | 2 +- src/gallium/drivers/panfrost/pan_screen.c | 2 +- src/panfrost/lib/pan_blit.c | 4 ++-- src/panfrost/lib/pan_shader.c | 8 ++++---- src/panfrost/lib/pan_shader.h | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_assemble.c b/src/gallium/drivers/panfrost/pan_assemble.c index 3f6338783fd..66549add540 100644 --- a/src/gallium/drivers/panfrost/pan_assemble.c +++ b/src/gallium/drivers/panfrost/pan_assemble.c @@ -282,7 +282,7 @@ panfrost_shader_compile(struct panfrost_context *ctx, panfrost_program *program; - program = panfrost_compile_shader(dev, NULL, s, &inputs); + program = pan_shader_compile(dev, NULL, s, &inputs); /* Prepare the compiled binary for upload */ mali_ptr shader = 0; diff --git a/src/gallium/drivers/panfrost/pan_blend_shaders.c b/src/gallium/drivers/panfrost/pan_blend_shaders.c index 2cb563cd33e..16c8b0937cd 100644 --- a/src/gallium/drivers/panfrost/pan_blend_shaders.c +++ b/src/gallium/drivers/panfrost/pan_blend_shaders.c @@ -302,7 +302,7 @@ panfrost_compile_blend_shader(struct panfrost_blend_shader *shader, bifrost_get_blend_desc(dev, shader->key.format, shader->key.rt); } - program = panfrost_compile_shader(dev, NULL, shader->nir, &inputs); + program = pan_shader_compile(dev, NULL, shader->nir, &inputs); /* Allow us to patch later */ shader->first_tag = program->first_tag; diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c index c28d7e0ca86..af9bafb81e5 100644 --- a/src/gallium/drivers/panfrost/pan_compute.c +++ b/src/gallium/drivers/panfrost/pan_compute.c @@ -64,7 +64,7 @@ panfrost_create_compute_state( blob_reader_init(&reader, hdr->blob, hdr->num_bytes); const struct nir_shader_compiler_options *options = - panfrost_get_shader_options(dev); + pan_shader_get_compiler_options(dev); so->cbase.prog = nir_deserialize(NULL, options, &reader); so->cbase.ir_type = PIPE_SHADER_IR_NIR; diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 0dde4374dec..8d725bc94fb 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -772,7 +772,7 @@ panfrost_screen_get_compiler_options(struct pipe_screen *pscreen, enum pipe_shader_ir ir, enum pipe_shader_type shader) { - return panfrost_get_shader_options(pan_device(pscreen)); + return pan_shader_get_compiler_options(pan_device(pscreen)); } struct pipe_screen * diff --git a/src/panfrost/lib/pan_blit.c b/src/panfrost/lib/pan_blit.c index 50a24aee1a0..ac2ea8f1455 100644 --- a/src/panfrost/lib/pan_blit.c +++ b/src/panfrost/lib/pan_blit.c @@ -53,7 +53,7 @@ panfrost_build_blit_shader(struct panfrost_device *dev, nir_builder _b = nir_builder_init_simple_shader(MESA_SHADER_FRAGMENT, - panfrost_get_shader_options(dev), + pan_shader_get_compiler_options(dev), "pan_blit"); nir_builder *b = &_b; nir_shader *shader = b->shader; @@ -111,7 +111,7 @@ panfrost_build_blit_shader(struct panfrost_device *dev, }; panfrost_program *program = - panfrost_compile_shader(dev, NULL, shader, &inputs); + pan_shader_compile(dev, NULL, shader, &inputs); ralloc_free(shader); return program; diff --git a/src/panfrost/lib/pan_shader.c b/src/panfrost/lib/pan_shader.c index 19d6be83e45..e3b13189db2 100644 --- a/src/panfrost/lib/pan_shader.c +++ b/src/panfrost/lib/pan_shader.c @@ -29,7 +29,7 @@ #include "panfrost/bifrost/bifrost_compile.h" const nir_shader_compiler_options * -panfrost_get_shader_options(const struct panfrost_device *dev) +pan_shader_get_compiler_options(const struct panfrost_device *dev) { if (pan_is_bifrost(dev)) return &bifrost_nir_options; @@ -38,9 +38,9 @@ panfrost_get_shader_options(const struct panfrost_device *dev) } panfrost_program * -panfrost_compile_shader(const struct panfrost_device *dev, - void *mem_ctx, nir_shader *nir, - const struct panfrost_compile_inputs *inputs) +pan_shader_compile(const struct panfrost_device *dev, + void *mem_ctx, nir_shader *nir, + const struct panfrost_compile_inputs *inputs) { if (pan_is_bifrost(dev)) return bifrost_compile_shader_nir(mem_ctx, nir, inputs); diff --git a/src/panfrost/lib/pan_shader.h b/src/panfrost/lib/pan_shader.h index 111c92ef5dd..7b3501da444 100644 --- a/src/panfrost/lib/pan_shader.h +++ b/src/panfrost/lib/pan_shader.h @@ -31,11 +31,11 @@ struct panfrost_device; const nir_shader_compiler_options * -panfrost_get_shader_options(const struct panfrost_device *dev); +pan_shader_get_compiler_options(const struct panfrost_device *dev); panfrost_program * -panfrost_compile_shader(const struct panfrost_device *dev, - void *mem_ctx, nir_shader *nir, - const struct panfrost_compile_inputs *inputs); +pan_shader_compile(const struct panfrost_device *dev, + void *mem_ctx, nir_shader *nir, + const struct panfrost_compile_inputs *inputs); #endif