From 28105471afce634df6c35ef14b198fe6e3684c00 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 17 Nov 2010 23:56:42 +0800
Subject: gallium: Add st_api::name.

It is the name of the rendering API.  This field is informative.
---
 src/gallium/include/state_tracker/st_api.h   | 5 +++++
 src/gallium/state_trackers/vega/Makefile     | 3 +++
 src/gallium/state_trackers/vega/SConscript   | 3 +++
 src/gallium/state_trackers/vega/vg_manager.c | 1 +
 src/mesa/state_tracker/st_manager.c          | 1 +
 5 files changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h
index 21e2165ed9..c73a53db33 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/state_tracker/st_api.h
@@ -401,6 +401,11 @@ struct st_manager
  */
 struct st_api
 {
+   /**
+    * The name of the rendering API.  This is informative.
+    */
+   const char *name;
+
    /**
     * The supported rendering API.
     */
diff --git a/src/gallium/state_trackers/vega/Makefile b/src/gallium/state_trackers/vega/Makefile
index e0a87151c4..0543fac094 100644
--- a/src/gallium/state_trackers/vega/Makefile
+++ b/src/gallium/state_trackers/vega/Makefile
@@ -9,6 +9,9 @@ LIBRARY_INCLUDES = \
 	-I$(TOP)/include \
 	-I$(TOP)/src/mapi
 
+LIBRARY_DEFINES = \
+	-DVEGA_VERSION_STRING=\"$(MESA_VERSION)\"
+
 C_SOURCES = \
            api.c           \
            api_context.c   \
diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index a25b8474e4..a62783ab18 100644
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -8,6 +8,9 @@ env = env.Clone()
 env.Append(CPPPATH = [
     '#/src/mapi',
 ])
+env.Append(CPPDEFINES = [
+    'VEGA_VERSION_STRING=',
+])
 
 vega_sources = [
     'api.c',
diff --git a/src/gallium/state_trackers/vega/vg_manager.c b/src/gallium/state_trackers/vega/vg_manager.c
index 232deefa16..bb15ec024f 100644
--- a/src/gallium/state_trackers/vega/vg_manager.c
+++ b/src/gallium/state_trackers/vega/vg_manager.c
@@ -535,6 +535,7 @@ vg_api_destroy(struct st_api *stapi)
 }
 
 static const struct st_api vg_api = {
+   "Vega " VEGA_VERSION_STRING,
    ST_API_OPENVG,
    ST_PROFILE_DEFAULT_MASK,
    vg_api_destroy,
diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 183477a3f3..35b59de5a0 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -865,6 +865,7 @@ st_manager_add_color_renderbuffer(struct st_context *st, struct gl_framebuffer *
 }
 
 static const struct st_api st_gl_api = {
+   "Mesa " MESA_VERSION_STRING,
    ST_API_OPENGL,
 #if FEATURE_GL
    ST_PROFILE_DEFAULT_MASK |
-- 
cgit v1.2.3