diff options
| -rw-r--r-- | src/glx/dri2.h | 8 | ||||
| -rw-r--r-- | src/glx/dri2_query_renderer.c | 39 | ||||
| -rw-r--r-- | src/glx/dri3_glx.c | 10 | ||||
| -rw-r--r-- | src/glx/dri3_priv.h | 1 |
4 files changed, 56 insertions, 2 deletions
diff --git a/src/glx/dri2.h b/src/glx/dri2.h index 72a608c508c..d07b2968fd9 100644 --- a/src/glx/dri2.h +++ b/src/glx/dri2.h @@ -96,4 +96,12 @@ _X_HIDDEN int dri2_query_renderer_string(struct glx_screen *base, int attribute, const char **value); +_X_HIDDEN int +dri3_query_renderer_integer(struct glx_screen *base, int attribute, + unsigned int *value); + +_X_HIDDEN int +dri3_query_renderer_string(struct glx_screen *base, int attribute, + const char **value); + #endif diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c index a28ced6ae6a..c96e1f94a42 100644 --- a/src/glx/dri2_query_renderer.c +++ b/src/glx/dri2_query_renderer.c @@ -28,6 +28,7 @@ #include "dri2.h" #include "dri_interface.h" #include "dri2_priv.h" +#include "dri3_priv.h" static int dri2_convert_glx_query_renderer_attribs(int attribute) @@ -98,4 +99,42 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value); } +_X_HIDDEN int +dri3_query_renderer_integer(struct glx_screen *base, int attribute, + unsigned int *value) +{ + struct dri3_screen *const psc = (struct dri3_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 +dri3_query_renderer_string(struct glx_screen *base, int attribute, + const char **value) +{ + struct dri3_screen *const psc = (struct dri3_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); +} + #endif /* GLX_DIRECT_RENDERING */ diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 4cde9ef5825..3d8a6627b1d 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -76,6 +76,7 @@ #include "dri_common.h" #include "dri3_priv.h" #include "loader.h" +#include "dri2.h" static const struct glx_context_vtable dri3_context_vtable; @@ -1599,14 +1600,19 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv, if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0) __glXEnableDirectExtension(&psc->base, "GLX_ARB_create_context_robustness"); + + if (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 dri3_screen_vtable = { .create_context = dri3_create_context, .create_context_attribs = dri3_create_context_attribs, - .query_renderer_integer = NULL, - .query_renderer_string = NULL, + .query_renderer_integer = dri3_query_renderer_integer, + .query_renderer_string = dri3_query_renderer_string, }; /** dri3_create_screen diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h index 38463310570..689488641a1 100644 --- a/src/glx/dri3_priv.h +++ b/src/glx/dri3_priv.h @@ -130,6 +130,7 @@ struct dri3_screen { const __DRI2flushExtension *f; const __DRI2configQueryExtension *config; const __DRItexBufferExtension *texBuffer; + const __DRI2rendererQueryExtension *rendererQuery; const __DRIconfig **driver_configs; void *driver; |