Mesa (master): glx/dri2: Add DRI2 support for GLX_MESA_query_renderer
Ian Romanick
idr at kemper.freedesktop.org
Fri Nov 8 02:24:13 UTC 2013
Module: Mesa
Branch: master
Commit: 4680d237c5ae2d1ce6446ff2ec2f0a91f8286554
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4680d237c5ae2d1ce6446ff2ec2f0a91f8286554
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Feb 15 22:35:55 2013 -0800
glx/dri2: Add DRI2 support for GLX_MESA_query_renderer
The new functions for this extension were added to a separate file
(dri2_query_renderer.c) to facilitate unit testing. I tried putting
them in dri2_glx.c, and it resulting in an unending chain of
dependencies. It was the proverbial threading hanging from a sweater.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glx/Makefile.am | 1 +
src/glx/dri2.h | 8 +++
src/glx/dri2_glx.c | 13 +++++-
src/glx/dri2_priv.h | 1 +
src/glx/dri2_query_renderer.c | 97 +++++++++++++++++++++++++++++++++++++++++
5 files changed, 119 insertions(+), 1 deletions(-)
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 64d5806..f66c4bd 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -93,6 +93,7 @@ libglx_la_SOURCES = \
glxhash.c \
dri2_glx.c \
dri2.c \
+ dri2_query_renderer.c \
applegl_glx.c
GL_LIBS = \
diff --git a/src/glx/dri2.h b/src/glx/dri2.h
index a6fe66e..c404a3a 100644
--- a/src/glx/dri2.h
+++ b/src/glx/dri2.h
@@ -85,4 +85,12 @@ DRI2CopyRegion(Display * dpy, XID drawable,
XserverRegion region,
CARD32 dest, CARD32 src);
+_X_HIDDEN int
+dri2_query_renderer_integer(struct glx_screen *base, int attribute,
+ unsigned int *value);
+
+_X_HIDDEN int
+dri2_query_renderer_string(struct glx_screen *base, int attribute,
+ const char **value);
+
#endif
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 84e88ec..3b33312 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -1117,12 +1117,23 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
&& strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
__glXEnableDirectExtension(&psc->base,
"GLX_ARB_create_context_robustness");
+
+ /* DRI2 version 3 is also required because GLX_MESA_query_renderer
+ * requires GLX_ARB_create_context_profile.
+ */
+ if (psc->dri2->base.version >= 3
+ && strcmp(extensions[i]->name, __DRI2_RENDERER_QUERY) == 0) {
+ psc->rendererQuery = (__DRI2rendererQueryExtension *) extensions[i];
+ __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
+ }
}
}
static const struct glx_screen_vtable dri2_screen_vtable = {
dri2_create_context,
- dri2_create_context_attribs
+ dri2_create_context_attribs,
+ dri2_query_renderer_integer,
+ dri2_query_renderer_string,
};
static struct glx_screen *
diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h
index 3ddcd6e..c21eee5 100644
--- a/src/glx/dri2_priv.h
+++ b/src/glx/dri2_priv.h
@@ -42,6 +42,7 @@ struct dri2_screen {
const __DRI2configQueryExtension *config;
const __DRItexBufferExtension *texBuffer;
const __DRI2throttleExtension *throttle;
+ const __DRI2rendererQueryExtension *rendererQuery;
const __DRIconfig **driver_configs;
void *driver;
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
new file mode 100644
index 0000000..b50a202
--- /dev/null
+++ b/src/glx/dri2_query_renderer.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include "glxclient.h"
+#include "glx_error.h"
+#include "xf86drm.h"
+#include "dri2.h"
+#include "dri_interface.h"
+#include "dri2_priv.h"
+
+static int
+dri2_convert_glx_query_renderer_attribs(int attribute)
+{
+ switch (attribute) {
+ case GLX_RENDERER_VENDOR_ID_MESA:
+ return __DRI2_RENDERER_VENDOR_ID;
+ case GLX_RENDERER_DEVICE_ID_MESA:
+ return __DRI2_RENDERER_DEVICE_ID;
+ case GLX_RENDERER_VERSION_MESA:
+ return __DRI2_RENDERER_VERSION;
+ case GLX_RENDERER_ACCELERATED_MESA:
+ return __DRI2_RENDERER_ACCELERATED;
+ case GLX_RENDERER_VIDEO_MEMORY_MESA:
+ return __DRI2_RENDERER_VIDEO_MEMORY;
+ case GLX_RENDERER_UNIFIED_MEMORY_ARCHITECTURE_MESA:
+ return __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE;
+ case GLX_RENDERER_PREFERRED_PROFILE_MESA:
+ return __DRI2_RENDERER_PREFERRED_PROFILE;
+ case GLX_RENDERER_OPENGL_CORE_PROFILE_VERSION_MESA:
+ return __DRI2_RENDERER_OPENGL_CORE_PROFILE_VERSION;
+ case GLX_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION_MESA:
+ return __DRI2_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION;
+ case GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA:
+ return __DRI2_RENDERER_OPENGL_ES_PROFILE_VERSION;
+ case GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA:
+ return __DRI2_RENDERER_OPENGL_ES2_PROFILE_VERSION;
+ default:
+ return -1;
+ }
+}
+
+_X_HIDDEN int
+dri2_query_renderer_integer(struct glx_screen *base, int attribute,
+ unsigned int *value)
+{
+ struct dri2_screen *const psc = (struct dri2_screen *) base;
+
+ /* Even though there are invalid values (and
+ * dri2_convert_glx_query_renderer_attribs may return -1), the higher level
+ * GLX code is required to perform the filtering. Assume that we got a
+ * good value.
+ */
+ const int dri_attribute = dri2_convert_glx_query_renderer_attribs(attribute);
+
+ if (psc->rendererQuery == NULL)
+ return -1;
+
+ return psc->rendererQuery->queryInteger(psc->driScreen, dri_attribute,
+ value);
+}
+
+_X_HIDDEN int
+dri2_query_renderer_string(struct glx_screen *base, int attribute,
+ const char **value)
+{
+ struct dri2_screen *const psc = (struct dri2_screen *) base;
+
+ /* Even though queryString only accepts a subset of the possible GLX
+ * queries, the higher level GLX code is required to perform the filtering.
+ * Assume that we got a good value.
+ */
+ const int dri_attribute = dri2_convert_glx_query_renderer_attribs(attribute);
+
+ if (psc->rendererQuery == NULL)
+ return -1;
+
+ return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value);
+}
More information about the mesa-commit
mailing list