Mesa (main): mesa: move common/dri into gallium
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Dec 4 00:40:52 UTC 2021
Module: Mesa
Branch: main
Commit: ea8fa10edd1f8976825c6aad05b904179a2deca3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea8fa10edd1f8976825c6aad05b904179a2deca3
Author: Dylan Baker <dylan.c.baker at intel.com>
Date: Thu Aug 5 11:10:31 2021 -0700
mesa: move common/dri into gallium
There are no other consumers, so we can just move this into gallium and
out of mesa.
Reviewed-by: Emma Anholt <emma at anholt.net>
Acked-by: Jason Ekstrand <jason at jlekstrand.net>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10153>
---
.../common => gallium/frontends/dri}/dri_util.c | 0
.../common => gallium/frontends/dri}/dri_util.h | 0
src/gallium/frontends/dri/meson.build | 6 +++-
.../dri/common => gallium/frontends/dri}/utils.c | 0
.../dri/common => gallium/frontends/dri}/utils.h | 0
src/gallium/frontends/omx/meson.build | 1 -
src/gallium/targets/d3dadapter9/meson.build | 2 +-
.../targets/dri}/megadriver_stub.c | 0
src/gallium/targets/dri/meson.build | 6 ++--
src/mesa/drivers/dri/common/meson.build | 39 ----------------------
src/mesa/drivers/dri/meson.build | 39 ----------------------
src/mesa/meson.build | 1 -
12 files changed, 9 insertions(+), 85 deletions(-)
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/gallium/frontends/dri/dri_util.c
similarity index 100%
rename from src/mesa/drivers/dri/common/dri_util.c
rename to src/gallium/frontends/dri/dri_util.c
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/gallium/frontends/dri/dri_util.h
similarity index 100%
rename from src/mesa/drivers/dri/common/dri_util.h
rename to src/gallium/frontends/dri/dri_util.h
diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build
index 36c9ba07a85..967047b0312 100644
--- a/src/gallium/frontends/dri/meson.build
+++ b/src/gallium/frontends/dri/meson.build
@@ -31,6 +31,10 @@ files_libdri = files(
'dri_query_renderer.h',
'dri_screen.c',
'dri_screen.h',
+ 'dri_util.c',
+ 'dri_util.h',
+ 'utils.c',
+ 'utils.h',
)
if with_dri
@@ -51,7 +55,7 @@ libdri = static_library(
files_libdri,
include_directories : [
inc_include, inc_util, inc_mesa, inc_mapi, inc_src, inc_gallium,
- inc_gallium_aux, inc_dri_common,
+ inc_gallium_aux, inc_util,
],
c_args : [libdri_c_args],
gnu_symbol_visibility : 'hidden',
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/gallium/frontends/dri/utils.c
similarity index 100%
rename from src/mesa/drivers/dri/common/utils.c
rename to src/gallium/frontends/dri/utils.c
diff --git a/src/mesa/drivers/dri/common/utils.h b/src/gallium/frontends/dri/utils.h
similarity index 100%
rename from src/mesa/drivers/dri/common/utils.h
rename to src/gallium/frontends/dri/utils.h
diff --git a/src/gallium/frontends/omx/meson.build b/src/gallium/frontends/omx/meson.build
index d0d2261d9b7..929c3a96f65 100644
--- a/src/gallium/frontends/omx/meson.build
+++ b/src/gallium/frontends/omx/meson.build
@@ -53,7 +53,6 @@ elif with_gallium_omx == 'tizonia'
)
inc_st_omx = [
inc_st_omx,
- inc_dri_common,
inc_loader,
inc_gbm,
inc_st_dri,
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index 74085bbdafe..c51c9ff1bf3 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -51,7 +51,7 @@ libgallium_nine = shared_library(
files('description.c', 'getproc.c', 'drm.c'),
include_directories : [
inc_include, inc_src, inc_loader, inc_mapi, inc_mesa, inc_util,
- inc_dri_common, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
+ inc_gallium, inc_gallium_aux, inc_gallium_winsys,
inc_gallium_drivers, inc_d3d9,
include_directories('../../frontends/nine'),
],
diff --git a/src/mesa/drivers/dri/common/megadriver_stub.c b/src/gallium/targets/dri/megadriver_stub.c
similarity index 100%
rename from src/mesa/drivers/dri/common/megadriver_stub.c
rename to src/gallium/targets/dri/megadriver_stub.c
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 13846237cd9..948a1b313bd 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -39,16 +39,16 @@ endif
libgallium_dri = shared_library(
'gallium_dri',
- files('target.c'),
+ files('target.c', 'megadriver_stub.c'),
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_drivers,
inc_gallium_winsys, include_directories('../../frontends/dri'),
],
gnu_symbol_visibility : 'hidden',
link_args : [ld_args_build_id, ld_args_gc_sections, gallium_dri_ld_args],
link_depends : gallium_dri_link_depends,
link_with : [
- libdri, libmesa, libdricommon, libmegadriver_stub, libgalliumvl,
+ libdri, libmesa, libgalliumvl,
libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri,
],
diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
deleted file mode 100644
index d2d063a8cc1..00000000000
--- a/src/mesa/drivers/dri/common/meson.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2017 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-inc_dri_common = include_directories('.')
-
-libdricommon = static_library(
- 'dricommon',
- files('utils.c', 'utils.h', 'dri_util.c', 'dri_util.h'),
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util],
- gnu_symbol_visibility : 'hidden',
- dependencies : [dep_libdrm, idep_mesautil],
- build_by_default : false,
-)
-
-libmegadriver_stub = static_library(
- 'megadriver_stub',
- 'megadriver_stub.c',
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
- gnu_symbol_visibility : 'hidden',
- dependencies : dep_libdrm,
- build_by_default : false,
-)
diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
deleted file mode 100644
index 0dc8060a338..00000000000
--- a/src/mesa/drivers/dri/meson.build
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2017 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-subdir('common')
-
-# This needs to be installed if any dri drivers (including gallium dri drivers)
-# are built.
-if with_dri
- dri_req_private = []
- if dep_libdrm.found()
- dri_req_private = ['libdrm >= ' + _drm_ver]
- endif
-
- pkg.generate(
- name : 'dri',
- filebase : 'dri',
- description : 'Direct Rendering Infrastructure',
- version : meson.project_version(),
- variables : ['dridriverdir=' + dri_drivers_path],
- requires_private : dri_req_private,
- )
-endif
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 8b308a7ba0a..b67ed0d1a34 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -582,7 +582,6 @@ libmesa = static_library(
build_by_default : false,
)
-subdir('drivers/dri')
if with_tests
subdir('main/tests')
endif
More information about the mesa-commit
mailing list