From 4680d237c5ae2d1ce6446ff2ec2f0a91f8286554 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 15 Feb 2013 22:35:55 -0800 Subject: 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 Reviewed-by: Kenneth Graunke --- src/glx/dri2_query_renderer.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 src/glx/dri2_query_renderer.c (limited to 'src/glx/dri2_query_renderer.c') diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c new file mode 100644 index 00000000000..b50a202ca42 --- /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); +} -- cgit v1.2.3