Mesa (main): radeonsi: port amdgcn_glslc build to meson

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 69d55f42b63f60bd05a885972d093da8ea71e9c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69d55f42b63f60bd05a885972d093da8ea71e9c5

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue May 31 09:03:19 2022 +0200

radeonsi: port amdgcn_glslc build to meson

Seems nice to reduce the number of old-fashioned build systems we have
in-tree.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16789>

---

 src/gallium/drivers/radeonsi/glsl_tests/HOW_TO_RUN         |  2 +-
 .../drivers/radeonsi/glsl_tests/{Makefile => meson.build}  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/glsl_tests/HOW_TO_RUN b/src/gallium/drivers/radeonsi/glsl_tests/HOW_TO_RUN
index 20f376f46fe..7774704f755 100644
--- a/src/gallium/drivers/radeonsi/glsl_tests/HOW_TO_RUN
+++ b/src/gallium/drivers/radeonsi/glsl_tests/HOW_TO_RUN
@@ -1,4 +1,4 @@
-Type "make" to build amdgcn_glslc.
+Type "meson build && meson compile -C build" to build amdgcn_glslc.
 
 amdgcn_glslc works only if radeonsi_dri.so is loaded by libGL.
 It's just a GL application that sets R600_DEBUG and captures stderr.
diff --git a/src/gallium/drivers/radeonsi/glsl_tests/Makefile b/src/gallium/drivers/radeonsi/glsl_tests/meson.build
similarity index 86%
rename from src/gallium/drivers/radeonsi/glsl_tests/Makefile
rename to src/gallium/drivers/radeonsi/glsl_tests/meson.build
index 117fae2b5ee..801450f627e 100644
--- a/src/gallium/drivers/radeonsi/glsl_tests/Makefile
+++ b/src/gallium/drivers/radeonsi/glsl_tests/meson.build
@@ -19,11 +19,13 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-CFLAGS ?= -g -O2 -march=native -pipe
-CFLAGS += -std=gnu99 -fopenmp
-LDLIBS = -lepoxy -lgbm
+project('glsl_tests', 'c')
 
-amdgcn_glslc:
+dep_epoxy = dependency('epoxy')
+dep_gbm = dependency('gbm')
 
-clean:
-	rm -f amdgcn_glslc
+executable(
+  'amdgcn_glslc',
+  files('amdgcn_glslc.c'),
+  dependencies: [dep_epoxy, dep_gbm]
+)