[Mesa-stable] [Mesa-dev] [PATCH] dri3: Enable GLX_MESA_query_renderer on DRI3 too

[Emil Velikov]

On 20/02/14 19:47, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> This should have happend around the time of commit 4680d23, but Keith's
> DRI3 patches and my GLX_MESA_query_renderer patches crossed in the mail.
> 
> I don't have a working DRI3 setup, so I haven't been able to actually
> verify this.  I'm hoping that someone can piglit this for me on DRI3...
> It's also unfortunate the DRI2 and DRI3 can't share more code.
> 
Hi Ian

I have some (tested) patches that add support for swrast, by ripping out
dri2_convert_glx_query_renderer_attribs to dri_common.c and managing it
from there. IMHO it seems a bit more appropriate place considering the
naming scheme of files/functions in the glx folder.

AFAICS your patches will work like a charm but I'm a bit short on a dri3
setup.

I will send out the lovely (20+) series tomorrow.
- Emil

> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Keith Packard <keithp at keithp.com>
> Cc: "10.1" <mesa-stable at lists.freedesktop.org>
> ---
>  src/glx/dri2.h                |  8 ++++++++
>  src/glx/dri2_query_renderer.c | 39 +++++++++++++++++++++++++++++++++++++++
>  src/glx/dri3_glx.c            | 10 +++++++++-
>  src/glx/dri3_priv.h           |  1 +
>  4 files changed, 57 insertions(+), 1 deletion(-)
> 
> diff --git a/src/glx/dri2.h b/src/glx/dri2.h
> index 90efde8..7977d83 100644
> --- a/src/glx/dri2.h
> +++ b/src/glx/dri2.h
> @@ -95,4 +95,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 b50a202..e13024c 100644
> --- a/src/glx/dri2_query_renderer.c
> +++ b/src/glx/dri2_query_renderer.c
> @@ -26,6 +26,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)
> @@ -95,3 +96,41 @@ 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);
> +}
> diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
> index 70ec057..3b7ee1e 100644
> --- a/src/glx/dri3_glx.c
> +++ b/src/glx/dri3_glx.c
> @@ -79,6 +79,7 @@
>  #include "dri_common.h"
>  #include "dri3_priv.h"
>  #include "loader.h"
> +#include "dri2.h"
>  
>  static const struct glx_context_vtable dri3_context_vtable;
>  
> @@ -1580,12 +1581,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 = {
>     dri3_create_context,
> -   dri3_create_context_attribs
> +   dri3_create_context_attribs,
> +   dri3_query_renderer_integer,
> +   dri3_query_renderer_string,
>  };
>  
>  /** dri3_create_screen
> diff --git a/src/glx/dri3_priv.h b/src/glx/dri3_priv.h
> index 1d124f8..3346a17 100644
> --- a/src/glx/dri3_priv.h
> +++ b/src/glx/dri3_priv.h
> @@ -129,6 +129,7 @@ struct dri3_screen {
>     const __DRI2flushExtension *f;
>     const __DRI2configQueryExtension *config;
>     const __DRItexBufferExtension *texBuffer;
> +   const __DRI2rendererQueryExtension *rendererQuery;
>     const __DRIconfig **driver_configs;
>  
>     void *driver;
>