mesa: Replace MESA_VERSION with PACKAGE_VERSION.

One fewer place to have to update.

Reviewed-by: Eric Anholt <[email protected]>

6 files changed, 6 insertions, 8 deletions

diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
index 8390bda4aeb..33ff03d77ee 100644
--- a/src/gallium/state_trackers/clover/Makefile.am
+++ b/src/gallium/state_trackers/clover/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS = \
 	$(GALLIUM_PIPE_LOADER_DEFINES) \
-	-DMESA_VERSION=\"$(MESA_VERSION)\" \
 	-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp
index d99aed8f564..cf68d0fc18c 100644
--- a/src/gallium/state_trackers/clover/api/device.cpp
+++ b/src/gallium/state_trackers/clover/api/device.cpp
@@ -217,13 +217,13 @@ clGetDeviceInfo(cl_device_id dev, cl_device_info param,
       return string_property(buf, size, size_ret, dev->vendor_name());
 
    case CL_DRIVER_VERSION:
-      return string_property(buf, size, size_ret, MESA_VERSION);
+      return string_property(buf, size, size_ret, PACKAGE_VERSION);
 
    case CL_DEVICE_PROFILE:
       return string_property(buf, size, size_ret, "FULL_PROFILE");
 
    case CL_DEVICE_VERSION:
-      return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " MESA_VERSION);
+      return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " PACKAGE_VERSION);
 
    case CL_DEVICE_EXTENSIONS:
       return string_property(buf, size, size_ret, "");
diff --git a/src/gallium/state_trackers/clover/api/platform.cpp b/src/gallium/state_trackers/clover/api/platform.cpp
index e5e80b85256..f99b6949356 100644
--- a/src/gallium/state_trackers/clover/api/platform.cpp
+++ b/src/gallium/state_trackers/clover/api/platform.cpp
@@ -51,7 +51,7 @@ clGetPlatformInfo(cl_platform_id platform, cl_platform_info param_name,
 
    case CL_PLATFORM_VERSION:
       return string_property(buf, size, size_ret,
-                             "OpenCL 1.1 MESA " MESA_VERSION);
+                             "OpenCL 1.1 MESA " PACKAGE_VERSION);
 
    case CL_PLATFORM_NAME:
       return string_property(buf, size, size_ret, "Default");
diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am
index 85c173212c4..3ae096c85f3 100644
--- a/src/gallium/state_trackers/vega/Makefile.am
+++ b/src/gallium/state_trackers/vega/Makefile.am
@@ -25,8 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = $(GALLIUM_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-DVEGA_VERSION_STRING=\"$(MESA_VERSION)\"
+	-I$(top_srcdir)/src/mapi
 
 noinst_LTLIBRARIES = libvega.la
 
diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index b68a73299a1..e3c3d093ea0 100644
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -12,7 +12,7 @@ env.Append(CPPPATH = [
     Dir('.'),
 ])
 env.Append(CPPDEFINES = [
-    'VEGA_VERSION_STRING=',
+    'PACKAGE_VERSION='
     'KHRONOS_DLL_EXPORTS',
 ])
 
diff --git a/src/gallium/state_trackers/vega/vg_manager.c b/src/gallium/state_trackers/vega/vg_manager.c
index 7b35f3afeeb..ad0e98d3a62 100644
--- a/src/gallium/state_trackers/vega/vg_manager.c
+++ b/src/gallium/state_trackers/vega/vg_manager.c
@@ -370,7 +370,7 @@ vg_api_destroy(struct st_api *stapi)
 }
 
 static const struct st_api vg_api = {
-   "Vega " VEGA_VERSION_STRING,
+   "Vega " PACKAGE_VERSION,
    ST_API_OPENVG,
    ST_PROFILE_DEFAULT_MASK,
    0,