Mesa (master): panfrost: Rename encoder/ to lib/
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Aug 7 00:14:54 UTC 2020
Module: Mesa
Branch: master
Commit: 1c62b5528ab09731388670202fa4a6ca5aa96534
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c62b5528ab09731388670202fa4a6ca5aa96534
Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date: Wed Aug 5 16:16:00 2020 -0400
panfrost: Rename encoder/ to lib/
We'll want both encoding and decoding here, as a generic hardware
interface library based on GenXML.
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6196>
---
src/gallium/drivers/panfrost/meson.build | 2 +-
src/gallium/drivers/panfrost/pan_context.c | 2 +-
src/gallium/drivers/panfrost/pan_job.c | 2 +-
src/gallium/drivers/panfrost/pan_resource.c | 2 +-
src/gallium/drivers/panfrost/pan_screen.c | 2 +-
src/panfrost/bifrost/test/bi_submit.c | 2 +-
src/panfrost/{encoder => lib}/meson.build | 8 ++++----
src/panfrost/{encoder => lib}/pan_afbc.c | 0
src/panfrost/{encoder => lib}/pan_attributes.c | 0
src/panfrost/{encoder => lib}/pan_blit.c | 0
src/panfrost/{encoder => lib}/pan_bo.c | 2 +-
src/panfrost/{encoder => lib}/pan_bo.h | 0
src/panfrost/{encoder => lib}/pan_device.h | 0
src/panfrost/{encoder => lib}/pan_encoder.h | 0
src/panfrost/{encoder => lib}/pan_format.c | 0
src/panfrost/{encoder => lib}/pan_invocation.c | 0
src/panfrost/{encoder => lib}/pan_pool.c | 0
src/panfrost/{encoder => lib}/pan_pool.h | 0
src/panfrost/{encoder => lib}/pan_props.c | 0
src/panfrost/{encoder => lib}/pan_sampler.c | 0
src/panfrost/{encoder => lib}/pan_scoreboard.c | 0
src/panfrost/{encoder => lib}/pan_scoreboard.h | 0
src/panfrost/{encoder => lib}/pan_scratch.c | 0
src/panfrost/{encoder => lib}/pan_texture.c | 0
src/panfrost/{encoder => lib}/pan_texture.h | 0
src/panfrost/{encoder => lib}/pan_tiler.c | 0
src/panfrost/{encoder => lib}/pan_util.h | 0
src/panfrost/meson.build | 6 +++---
28 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index c3181e7fab3..89f877a5bb2 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -73,5 +73,5 @@ libpanfrost = static_library(
driver_panfrost = declare_dependency(
compile_args : compile_args_panfrost,
- link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_encoder],
+ link_with : [libpanfrost, libpanfrostwinsys, libpanfrost_shared, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_decode, libpanfrost_lib],
)
diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 8be2bb6f6f1..1e313c999db 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -53,7 +53,7 @@
#include "pan_blend_shaders.h"
#include "pan_cmdstream.h"
#include "pan_util.h"
-#include "pandecode/decode.h"
+#include "decode.h"
#include "util/pan_lower_framebuffer.h"
struct midgard_tiler_descriptor
diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c
index d59aa22f049..10bca05b26a 100644
--- a/src/gallium/drivers/panfrost/pan_job.c
+++ b/src/gallium/drivers/panfrost/pan_job.c
@@ -36,7 +36,7 @@
#include "util/rounding.h"
#include "pan_util.h"
#include "pan_blending.h"
-#include "pandecode/decode.h"
+#include "decode.h"
#include "panfrost-quirks.h"
/* panfrost_bo_access is here to help us keep track of batch accesses to BOs
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 5d651ee44d1..e647a6c7f8b 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -47,7 +47,7 @@
#include "pan_resource.h"
#include "pan_util.h"
#include "pan_tiling.h"
-#include "pandecode/decode.h"
+#include "decode.h"
#include "panfrost-quirks.h"
static struct pipe_resource *
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index c2e4b9beb65..eed910fb3f8 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -48,7 +48,7 @@
#include "pan_resource.h"
#include "pan_public.h"
#include "pan_util.h"
-#include "pandecode/decode.h"
+#include "decode.h"
#include "pan_context.h"
#include "midgard/midgard_compile.h"
diff --git a/src/panfrost/bifrost/test/bi_submit.c b/src/panfrost/bifrost/test/bi_submit.c
index fac31b016e3..38539c09cbc 100644
--- a/src/panfrost/bifrost/test/bi_submit.c
+++ b/src/panfrost/bifrost/test/bi_submit.c
@@ -25,7 +25,7 @@
*/
#include "bit.h"
-#include "panfrost/pandecode/decode.h"
+#include "panfrost/lib/decode.h"
#include "drm-uapi/panfrost_drm.h"
#include "panfrost/encoder/pan_encoder.h"
diff --git a/src/panfrost/encoder/meson.build b/src/panfrost/lib/meson.build
similarity index 92%
rename from src/panfrost/encoder/meson.build
rename to src/panfrost/lib/meson.build
index 754e7ce246c..a6b39baf4e6 100644
--- a/src/panfrost/encoder/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -19,7 +19,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libpanfrost_encoder_files = files(
+libpanfrost_lib_files = files(
'pan_encoder.h',
'pan_afbc.c',
@@ -37,9 +37,9 @@ libpanfrost_encoder_files = files(
'pan_props.c',
)
-libpanfrost_encoder = static_library(
- 'panfrost_encoder',
- [libpanfrost_encoder_files],
+libpanfrost_lib = static_library(
+ 'panfrost_lib',
+ [libpanfrost_lib_files],
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
c_args : [no_override_init_args],
gnu_symbol_visibility : 'hidden',
diff --git a/src/panfrost/encoder/pan_afbc.c b/src/panfrost/lib/pan_afbc.c
similarity index 100%
rename from src/panfrost/encoder/pan_afbc.c
rename to src/panfrost/lib/pan_afbc.c
diff --git a/src/panfrost/encoder/pan_attributes.c b/src/panfrost/lib/pan_attributes.c
similarity index 100%
rename from src/panfrost/encoder/pan_attributes.c
rename to src/panfrost/lib/pan_attributes.c
diff --git a/src/panfrost/encoder/pan_blit.c b/src/panfrost/lib/pan_blit.c
similarity index 100%
rename from src/panfrost/encoder/pan_blit.c
rename to src/panfrost/lib/pan_blit.c
diff --git a/src/panfrost/encoder/pan_bo.c b/src/panfrost/lib/pan_bo.c
similarity index 99%
rename from src/panfrost/encoder/pan_bo.c
rename to src/panfrost/lib/pan_bo.c
index 71bc109060d..03a83c4a755 100644
--- a/src/panfrost/encoder/pan_bo.c
+++ b/src/panfrost/lib/pan_bo.c
@@ -32,7 +32,7 @@
#include "pan_bo.h"
#include "pan_util.h"
-#include "../pandecode/public.h"
+#include "wrap.h"
#include "os/os_mman.h"
diff --git a/src/panfrost/encoder/pan_bo.h b/src/panfrost/lib/pan_bo.h
similarity index 100%
rename from src/panfrost/encoder/pan_bo.h
rename to src/panfrost/lib/pan_bo.h
diff --git a/src/panfrost/encoder/pan_device.h b/src/panfrost/lib/pan_device.h
similarity index 100%
rename from src/panfrost/encoder/pan_device.h
rename to src/panfrost/lib/pan_device.h
diff --git a/src/panfrost/encoder/pan_encoder.h b/src/panfrost/lib/pan_encoder.h
similarity index 100%
rename from src/panfrost/encoder/pan_encoder.h
rename to src/panfrost/lib/pan_encoder.h
diff --git a/src/panfrost/encoder/pan_format.c b/src/panfrost/lib/pan_format.c
similarity index 100%
rename from src/panfrost/encoder/pan_format.c
rename to src/panfrost/lib/pan_format.c
diff --git a/src/panfrost/encoder/pan_invocation.c b/src/panfrost/lib/pan_invocation.c
similarity index 100%
rename from src/panfrost/encoder/pan_invocation.c
rename to src/panfrost/lib/pan_invocation.c
diff --git a/src/panfrost/encoder/pan_pool.c b/src/panfrost/lib/pan_pool.c
similarity index 100%
rename from src/panfrost/encoder/pan_pool.c
rename to src/panfrost/lib/pan_pool.c
diff --git a/src/panfrost/encoder/pan_pool.h b/src/panfrost/lib/pan_pool.h
similarity index 100%
rename from src/panfrost/encoder/pan_pool.h
rename to src/panfrost/lib/pan_pool.h
diff --git a/src/panfrost/encoder/pan_props.c b/src/panfrost/lib/pan_props.c
similarity index 100%
rename from src/panfrost/encoder/pan_props.c
rename to src/panfrost/lib/pan_props.c
diff --git a/src/panfrost/encoder/pan_sampler.c b/src/panfrost/lib/pan_sampler.c
similarity index 100%
rename from src/panfrost/encoder/pan_sampler.c
rename to src/panfrost/lib/pan_sampler.c
diff --git a/src/panfrost/encoder/pan_scoreboard.c b/src/panfrost/lib/pan_scoreboard.c
similarity index 100%
rename from src/panfrost/encoder/pan_scoreboard.c
rename to src/panfrost/lib/pan_scoreboard.c
diff --git a/src/panfrost/encoder/pan_scoreboard.h b/src/panfrost/lib/pan_scoreboard.h
similarity index 100%
rename from src/panfrost/encoder/pan_scoreboard.h
rename to src/panfrost/lib/pan_scoreboard.h
diff --git a/src/panfrost/encoder/pan_scratch.c b/src/panfrost/lib/pan_scratch.c
similarity index 100%
rename from src/panfrost/encoder/pan_scratch.c
rename to src/panfrost/lib/pan_scratch.c
diff --git a/src/panfrost/encoder/pan_texture.c b/src/panfrost/lib/pan_texture.c
similarity index 100%
rename from src/panfrost/encoder/pan_texture.c
rename to src/panfrost/lib/pan_texture.c
diff --git a/src/panfrost/encoder/pan_texture.h b/src/panfrost/lib/pan_texture.h
similarity index 100%
rename from src/panfrost/encoder/pan_texture.h
rename to src/panfrost/lib/pan_texture.h
diff --git a/src/panfrost/encoder/pan_tiler.c b/src/panfrost/lib/pan_tiler.c
similarity index 100%
rename from src/panfrost/encoder/pan_tiler.c
rename to src/panfrost/lib/pan_tiler.c
diff --git a/src/panfrost/encoder/pan_util.h b/src/panfrost/lib/pan_util.h
similarity index 100%
rename from src/panfrost/encoder/pan_util.h
rename to src/panfrost/lib/pan_util.h
diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 80adf9d1cd5..8615bcaf7da 100644
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -24,7 +24,7 @@ inc_panfrost_hw = include_directories([
])
inc_panfrost = include_directories([
- '.', 'include', 'shared', 'midgard', 'bifrost', 'encoder'
+ '.', 'include', 'shared', 'midgard', 'bifrost', 'lib'
])
subdir('shared')
@@ -32,7 +32,7 @@ subdir('util')
subdir('midgard')
subdir('bifrost')
subdir('pandecode')
-subdir('encoder')
+subdir('lib')
files_bifrost = files(
'bifrost/cmdline.c',
@@ -63,7 +63,7 @@ bifrost_compiler = executable(
libglsl_standalone,
libpanfrost_bifrost,
libpanfrost_decode,
- libpanfrost_encoder,
+ libpanfrost_lib,
libpanfrost_midgard, # references disassemble_midgard...
],
build_by_default : with_tools.contains('panfrost')
More information about the mesa-commit
mailing list