fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Re-run clang-format

Browse source 
We've regressed the clang-formatting in a few places, since we're not enforcing
formatting in CI yet and I think at one point my editor wasn't quite right.
Reapply so we can get to clang-format-clean.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22372>
This commit is contained in:
Alyssa Rosenzweig 2023-04-07 20:11:58 -04:00 • committed by Marge Bot
parent 0a67386b40
commit 4ccf174009
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -1750,7 +1750,7 @@ panfrost_emit_null_texture(struct mali_texture_packed *out)
cfg.format = PAN_ARCH >= 7 ? panfrost_pipe_format_v7[PIPE_FORMAT_NONE].hw
: panfrost_pipe_format_v6[PIPE_FORMAT_NONE].hw;
#if PAN_ARCH <= 7
cfg.texel_ordering = MALI_TEXTURE_LAYOUT_LINEAR;
cfg.texel_ordering = MALI_TEXTURE_LAYOUT_LINEAR;
#endif
}
}

4
src/gallium/drivers/panfrost/pan_public.h
View file

@ -32,7 +32,9 @@ struct pipe_screen;
struct pipe_screen_config;
struct renderonly;
struct pipe_screen *panfrost_create_screen(int fd, const struct pipe_screen_config *config, struct renderonly *ro);
struct pipe_screen *
panfrost_create_screen(int fd, const struct pipe_screen_config *config,
struct renderonly *ro);
#ifdef __cplusplus
}

8
src/panfrost/compiler/bifrost_compile.c
View file

@ -4790,8 +4790,8 @@ bifrost_preprocess_nir(nir_shader *nir, unsigned gpu_id)
static bi_context *
bi_compile_variant_nir(nir_shader *nir,
const struct panfrost_compile_inputs *inputs,
struct util_dynarray *binary,
struct bi_shader_info info, enum bi_idvs_mode idvs)
struct util_dynarray *binary, struct bi_shader_info info,
enum bi_idvs_mode idvs)
{
bi_context *ctx = rzalloc(NULL, bi_context);
@ -5055,8 +5055,8 @@ bi_compile_variant_nir(nir_shader *nir,
static void
bi_compile_variant(nir_shader *nir,
const struct panfrost_compile_inputs *inputs,
struct util_dynarray *binary,
struct pan_shader_info *info, enum bi_idvs_mode idvs)
struct util_dynarray *binary, struct pan_shader_info *info,
enum bi_idvs_mode idvs)
{
struct bi_shader_info local_info = {
.push = &info->push,

4
src/panfrost/include/panfrost-job.h
View file

@ -38,8 +38,8 @@ typedef uint32_t u32;
typedef uint64_t u64;
typedef uint64_t mali_ptr;
#define MALI_FORMAT_COMPRESSED (0 << 5)
#define MALI_EXTRACT_TYPE(fmt) ((fmt)&0xe0)
#define MALI_FORMAT_COMPRESSED (0 << 5)
#define MALI_EXTRACT_TYPE(fmt) ((fmt)&0xe0)
#define MALI_EXTRACT_INDEX(pixfmt) (((pixfmt) >> 12) & 0xFF)
/* Mali hardware can texture up to 65536 x 65536 x 65536 and render up to 16384

2
src/panfrost/lib/pan_bo.c
View file

@ -465,7 +465,7 @@ panfrost_bo_import(struct panfrost_device *dev, int fd)
unsigned gem_handle;
pthread_mutex_lock(&dev->bo_map_lock);
ret = drmPrimeFDToHandle(dev->fd, fd, &gem_handle);
assert(!ret);

10
src/panfrost/lib/pan_util.h
View file

@ -38,11 +38,11 @@
#define PAN_DBG_DIRTY 0x0008
#define PAN_DBG_SYNC 0x0010
/* 0x20 unused */
#define PAN_DBG_NOFP16 0x0040
#define PAN_DBG_CRC 0x0080
#define PAN_DBG_GL3 0x0100
#define PAN_DBG_NO_AFBC 0x0200
#define PAN_DBG_MSAA16 0x0400
#define PAN_DBG_NOFP16 0x0040
#define PAN_DBG_CRC 0x0080
#define PAN_DBG_GL3 0x0100
#define PAN_DBG_NO_AFBC 0x0200
#define PAN_DBG_MSAA16 0x0400
/* 0x800 unused */
#define PAN_DBG_LINEAR 0x1000
#define PAN_DBG_NO_CACHE 0x2000