diff options
| author | Thomas Hellstrom <[email protected]> | 2014-04-03 07:59:31 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2014-04-04 08:33:43 +0200 |
| commit | 61bedc3d6b08943f015f9d590c07a6af36c2a92c (patch) | |
| tree | 2e823f6dcdfd453778b3954a05c2059fccdb6285 | |
| parent | 4fa58ae5c78c15287ad59950c3634017a39e28b6 (diff) | |
st/xa: Fix advertized version number and try to avoid future discrepancies
The xa version number had to be set in two places. In configure.ac and in
xa_tracker.h. Furthermore, xa_tracker.h is an installed header so we can't
use mesa internal defines. So therefore, at configure time, modify the
xa_tracker.h header to use the version given by configure.ac
Signed-off-by: Thomas Hellstrom <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_tracker.h.in (renamed from src/gallium/state_trackers/xa/xa_tracker.h) | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index af1b0d1fa40..9b665b017f3 100644 --- a/configure.ac +++ b/configure.ac @@ -2055,6 +2055,7 @@ AC_CONFIG_FILES([Makefile src/gallium/state_trackers/vdpau/Makefile src/gallium/state_trackers/vega/Makefile src/gallium/state_trackers/xa/Makefile + src/gallium/state_trackers/xa/xa_tracker.h src/gallium/state_trackers/xvmc/Makefile src/gallium/targets/Makefile src/gallium/targets/dri-freedreno/Makefile diff --git a/src/gallium/state_trackers/xa/xa_tracker.h b/src/gallium/state_trackers/xa/xa_tracker.h.in index 43e56ff0c77..25344f5ee53 100644 --- a/src/gallium/state_trackers/xa/xa_tracker.h +++ b/src/gallium/state_trackers/xa/xa_tracker.h.in @@ -36,9 +36,9 @@ #include <stdint.h> -#define XA_TRACKER_VERSION_MAJOR 2 -#define XA_TRACKER_VERSION_MINOR 1 -#define XA_TRACKER_VERSION_PATCH 0 +#define XA_TRACKER_VERSION_MAJOR @XA_MAJOR@ +#define XA_TRACKER_VERSION_MINOR @XA_MINOR@ +#define XA_TRACKER_VERSION_PATCH @XA_TINY@ #define XA_FLAG_SHARED (1 << 0) #define XA_FLAG_RENDER_TARGET (1 << 1) |