Mesa (master): gallium: add GLX_MESA_query_renderer caps

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 139751403c56d965d7c22bceddd34387759075a9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=139751403c56d965d7c22bceddd34387759075a9

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Aug 15 17:36:34 2014 +0100

gallium: add GLX_MESA_query_renderer caps

Namely vendor/device id, accelerated and UMA, which will be used to describe
the underlying renderer.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/docs/source/screen.rst   |    8 ++++++++
 src/gallium/include/pipe/p_defines.h |    5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index 6fecc15..2694923 100644
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -215,6 +215,14 @@ The integer capabilities:
   See pipe_draw_info.
 * ``PIPE_CAP_TGSI_FS_FINE_DERIVATIVE``: Whether the fragment shader supports
   the FINE versions of DDX/DDY.
+* ``PIPE_CAP_VENDOR_ID``: The vendor ID of the underlying hardware. If it's
+  not available one should return 0xFFFFFFFF.
+* ``PIPE_CAP_DEVICE_ID``: The device ID (PCI ID) of the underlying hardware.
+  0xFFFFFFFF if not available.
+* ``PIPE_CAP_ACCELERATED``: Whether the renderer is hardware accelerated.
+* ``PIPE_CAP_VIDEO_MEMORY``: The amount of video memory in megabytes.
+* ``PIPE_CAP_UMA``: If the device has a unified memory architecture or on-card
+  memory and GART.
 
 
 .. _pipe_capf:
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 53d5d4b..1a31350 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -563,6 +563,11 @@ enum pipe_cap {
    PIPE_CAP_MAX_VERTEX_STREAMS = 100,
    PIPE_CAP_DRAW_INDIRECT = 101,
    PIPE_CAP_TGSI_FS_FINE_DERIVATIVE = 102,
+   PIPE_CAP_VENDOR_ID = 103,
+   PIPE_CAP_DEVICE_ID = 104,
+   PIPE_CAP_ACCELERATED = 105,
+   PIPE_CAP_VIDEO_MEMORY = 106,
+   PIPE_CAP_UMA = 107,
 };
 
 #define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0)