glx/drisw: add support for DRI2rendererQueryExtension

The extension is used by GLX_MESA_query_renderer, which
can be provided for by hardware and software drivers.

v2: Use designated initializers.
v3: Move drisw_query_renderer_*() to dri2_query_renderer.c

Signed-off-by: Emil Velikov <[email protected]>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index fab9e70d63a..749ceb08aac 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -599,8 +599,8 @@ driOpenSwrast(void)
 static const struct glx_screen_vtable drisw_screen_vtable = {
    .create_context         = drisw_create_context,
    .create_context_attribs = drisw_create_context_attribs,
-   .query_renderer_integer = NULL,
-   .query_renderer_string  = NULL,
+   .query_renderer_integer = drisw_query_renderer_integer,
+   .query_renderer_string  = drisw_query_renderer_string,
 };
 
 static void
@@ -629,6 +629,14 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
 	 psc->texBuffer = (__DRItexBufferExtension *) extensions[i];
 	 __glXEnableDirectExtension(&psc->base, "GLX_EXT_texture_from_pixmap");
       }
+      /* DRISW version 3 is also required because GLX_MESA_query_renderer
+       * requires GLX_ARB_create_context_profile.
+       */
+      if (psc->swrast->base.version >= 3
+          && strcmp(extensions[i]->name, __DRI2_RENDERER_QUERY) == 0) {
+         psc->rendererQuery = (__DRI2rendererQueryExtension *) extensions[i];
+         __glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
+      }
    }
 }