sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (5badd9344837aa0ec706c51ab9d8b05b80505a52)
- From: Justin Boffemmyer <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (5badd9344837aa0ec706c51ab9d8b05b80505a52)
- Date: Mon, 20 Jan 2025 23:41:02 +0000
GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:
graphics-libs/mesa/BUILD | 3 ++-
graphics-libs/mesa/CONFIGURE | 13 +++++++++----
graphics-libs/mesa/HISTORY | 5 ++---
3 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 5badd9344837aa0ec706c51ab9d8b05b80505a52
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
devel/llvm: correct OpenCL options
Corrected the OpenCL clover frontend option to a choice (meson combo)
instead of a binary feature (enabled/disabled).
commit 0ff34ce8a88f3032a0b1c27870b580c052048f09
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
Revert "graphics-libs/mesa: fixed the type of MESA_OPENCL and removed"
This reverts commit b9f3fcbaa37eb5bd9c7ab7791b4f82e2f2f65632.
There is definitely an opencl-spirv flag. It is present in
meson_options.txt and used in meson.build.
diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index f735bcd..de53baa 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -40,7 +40,7 @@ meson_opt boolean "gallium-d3d10umd"
"$MESA_GALLIUM_D3D10" &&
meson_opt feature "gallium-d3d12-graphics" "$MESA_GALLIUM_D3D12_PIPELINE" &&
meson_opt feature "gallium-d3d12-video" "$MESA_GALLIUM_D3D12_VIDEO" &&
meson_opt boolean "gallium-extra-hud" "$MESA_GALLIUM_HUD" &&
-meson_opt choice "gallium-opencl" "$MESA_OPENCL" &&
+meson_opt choice "gallium-opencl" "${MESA_OPENCL:-disabled}" &&
meson_opt boolean "gallium-rusticl" "$MESA_RUSTICL" &&
meson_opt feature "gallium-xa" "$MESA_GALLIUM_XA" &&
meson_opt feature "gbm" "$MESA_GBM" &&
@@ -53,6 +53,7 @@ meson_opt boolean "glx-read-only-text"
"$MESA_GLX_READONLY" &&
meson_opt boolean "gpuvis" "$MESA_GPUVIS" &&
meson_opt feature "intel-rt" "$MESA_INTEL_RAYTRACE" &&
meson_opt boolean "llvm-orcjit" "$MESA_LLVM_ORCJIT" &&
+meson_opt boolean "opencl-spirv" "$MESA_OPENCL_SPIRV" &&
meson_opt boolean "opengl" "$MESA_OPENGL" &&
meson_opt boolean "osmesa" "$MESA_OSMESA" &&
meson_opt boolean "perfetto" "$MESA_PERFETTO" &&
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 2065fd6..56c1e33 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -63,10 +63,15 @@ if [ -n "$MESA_GALLIUM" ] && ! list_find "$MESA_GALLIUM"
none ;then
config_query MESA_GALLIUM_D3D12_VIDEO "Build gallium with Direct3D12
video support?" n
fi &&
- config_query_list MESA_OPENCL "Build gallium OpenCL (clover) frontend?" \
- icd \
- standalone \
- disabled &&
+ config_query_list MESA_OPENCL_ENABLE "Build gallium OpenCL (clover)
frontend?" n &&
+
+ if [[ "$MESA_OPENCL_ENABLE" == "y" ]] ;then
+ config_query_list MESA_OPENCL "How should the gallium OpenCL (clover)
frontend be built?" \
+ icd \
+ standalone \
+ &&
+ config_query MESA_OPENCL_SPIRV "Enable SPIR-V support in OpenCL (clover)
frontend?" n
+ fi &&
config_query MESA_RUSTICL "Build gallium rusticl frontend?" n &&
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 5a6bfd0..e5d3812 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,6 +1,5 @@
-2025-01-20 Pavel Vinogradov <public AT sourcemage.org>
- * CONFIGURE, BUILD: fixed the type of MESA_OPENCL and removed
- MESA_OPENCL_SPIRV handle along with non-existant opencl-spirv flag
+2025-01-21 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD, CONFIGURE: correct OpenCL options
2025-01-20 Justin Boffemmyer <flux AT sourcemage.org>
* CONFIGURE, DEPENDS: fix typos
- [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (5badd9344837aa0ec706c51ab9d8b05b80505a52), Justin Boffemmyer, 01/20/2025
Archive powered by MHonArc 2.6.24.