Module: Mesa Branch: main Commit: e1443471400c289aa8a99abe1811001f296338ce URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1443471400c289aa8a99abe1811001f296338ce
Author: Boris Brezillon <[email protected]> Date: Fri Nov 17 11:32:52 2023 +0100 panfrost: Rename pan_cs.{c,h} into pan_desc.{c,h} Pre v10 Mali GPU were describing GPU jobs as a chain of job descriptors, but new generations moved to a command stream based approach. The pan_cs.{h,c} name was chosen based on the assumption this job chain would replace the command stream we have on other GPUs, things will become a lot more confusing now that we have a real command stream. Let's rename these files before it happens. Given all the helpers in there are either emitting descriptors, and calculating values to be put in such descriptors, pan_desc.{c,h} sounds like an acceptable name. Signed-off-by: Boris Brezillon <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26356> --- src/gallium/drivers/panfrost/pan_job.h | 2 +- src/panfrost/lib/meson.build | 2 +- src/panfrost/lib/pan_blitter.c | 2 +- src/panfrost/lib/pan_blitter.h | 2 +- src/panfrost/lib/{pan_cs.c => pan_desc.c} | 2 +- src/panfrost/lib/{pan_cs.h => pan_desc.h} | 4 ++-- src/panfrost/vulkan/panvk_cs.c | 2 +- src/panfrost/vulkan/panvk_cs.h | 2 +- src/panfrost/vulkan/panvk_private.h | 2 +- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 2 +- src/panfrost/vulkan/panvk_vX_cs.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_job.h b/src/gallium/drivers/panfrost/pan_job.h index 28cea3c3bfb..6856bc723ea 100644 --- a/src/gallium/drivers/panfrost/pan_job.h +++ b/src/gallium/drivers/panfrost/pan_job.h @@ -28,7 +28,7 @@ #include "pipe/p_state.h" #include "util/u_dynarray.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_jm.h" #include "pan_mempool.h" #include "pan_resource.h" diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build index 139f34b9afa..e27483e1280 100644 --- a/src/panfrost/lib/meson.build +++ b/src/panfrost/lib/meson.build @@ -45,7 +45,7 @@ foreach ver : ['4', '5', '6', '7', '9'] [ 'pan_blend.c', 'pan_blitter.c', - 'pan_cs.c', + 'pan_desc.c', 'pan_shader.c', 'pan_texture.c', ], diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c index be55e0ff7bd..c195763d337 100644 --- a/src/panfrost/lib/pan_blitter.c +++ b/src/panfrost/lib/pan_blitter.c @@ -31,7 +31,7 @@ #include "compiler/nir/nir_builder.h" #include "util/u_math.h" #include "pan_blend.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_encoder.h" #include "pan_jc.h" #include "pan_pool.h" diff --git a/src/panfrost/lib/pan_blitter.h b/src/panfrost/lib/pan_blitter.h index f613c693c5c..9ff4affdc3e 100644 --- a/src/panfrost/lib/pan_blitter.h +++ b/src/panfrost/lib/pan_blitter.h @@ -28,7 +28,7 @@ #include "genxml/gen_macros.h" #include "util/format/u_format.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_pool.h" #include "pan_texture.h" #include "pan_util.h" diff --git a/src/panfrost/lib/pan_cs.c b/src/panfrost/lib/pan_desc.c similarity index 99% rename from src/panfrost/lib/pan_cs.c rename to src/panfrost/lib/pan_desc.c index 770102914a5..897d1f759b8 100644 --- a/src/panfrost/lib/pan_cs.c +++ b/src/panfrost/lib/pan_desc.c @@ -29,7 +29,7 @@ #include "genxml/gen_macros.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_encoder.h" #include "pan_texture.h" diff --git a/src/panfrost/lib/pan_cs.h b/src/panfrost/lib/pan_desc.h similarity index 99% rename from src/panfrost/lib/pan_cs.h rename to src/panfrost/lib/pan_desc.h index b4266d4b6b4..18b789e3735 100644 --- a/src/panfrost/lib/pan_cs.h +++ b/src/panfrost/lib/pan_desc.h @@ -25,8 +25,8 @@ * Boris Brezillon <[email protected]> */ -#ifndef __PAN_CS_H -#define __PAN_CS_H +#ifndef __PAN_DESC_H +#define __PAN_DESC_H #include "genxml/gen_macros.h" diff --git a/src/panfrost/vulkan/panvk_cs.c b/src/panfrost/vulkan/panvk_cs.c index a26c7900eeb..eb998206f8e 100644 --- a/src/panfrost/vulkan/panvk_cs.c +++ b/src/panfrost/vulkan/panvk_cs.c @@ -24,7 +24,7 @@ #include "compiler/shader_enums.h" #include "util/macros.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_pool.h" #include "panvk_cs.h" diff --git a/src/panfrost/vulkan/panvk_cs.h b/src/panfrost/vulkan/panvk_cs.h index 1b0bef50c03..eb4205874fb 100644 --- a/src/panfrost/vulkan/panvk_cs.h +++ b/src/panfrost/vulkan/panvk_cs.h @@ -29,7 +29,7 @@ #include <vulkan/vulkan.h> #include "compiler/shader_enums.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "panfrost-job.h" #include "vk_util.h" diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index f04264dee30..967bf4dcb00 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -67,7 +67,7 @@ #include "drm-uapi/panfrost_drm.h" #include "pan_blend.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_device.h" #include "pan_jc.h" #include "pan_texture.h" diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index d6806ff61b2..07adda42410 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -32,7 +32,7 @@ #include "panvk_private.h" #include "pan_blitter.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_encoder.h" #include "util/rounding.h" diff --git a/src/panfrost/vulkan/panvk_vX_cs.c b/src/panfrost/vulkan/panvk_vX_cs.c index a409700fb08..69605b304c4 100644 --- a/src/panfrost/vulkan/panvk_vX_cs.c +++ b/src/panfrost/vulkan/panvk_vX_cs.c @@ -28,7 +28,7 @@ #include "vk_util.h" -#include "pan_cs.h" +#include "pan_desc.h" #include "pan_earlyzs.h" #include "pan_encoder.h" #include "pan_pool.h"
