KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

panfrost: Prefix shader related helpers with pan_shader_ 

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8963>
This commit is contained in:
Boris Brezillon 2021-02-12 16:59:59 +01:00 committed by Marge Bot
parent 10d9c4e574
commit 8d7eda9c95
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_assemble.c
View File

@ -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;

2
src/gallium/drivers/panfrost/pan_blend_shaders.c
View File

@ -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;

2
src/gallium/drivers/panfrost/pan_compute.c
View File

@ -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;

2
src/gallium/drivers/panfrost/pan_screen.c
View File

@ -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 *

4
src/panfrost/lib/pan_blit.c
View File

@ -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;

8
src/panfrost/lib/pan_shader.c
View File

@ -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);

8
src/panfrost/lib/pan_shader.h
View File

@ -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