st/dri: don't set PIPE_BIND_SCANOUT for MSAA surfaces

[mesa.git] / src / gallium / state_trackers / dri / drisw.c

diff --git a/src/gallium/state_trackers/dri/drisw.c b/src/gallium/state_trackers/dri/drisw.c
index 607d22297fec07715d756ac7adf2f5dedf7a1539..4a2c1bbc2ee33f71d4f551b472e7f76e76aa548f 100644 (file)
--- a/src/gallium/state_trackers/dri/drisw.c
+++ b/src/gallium/state_trackers/dri/drisw.c
@@ -45,6 +45,7 @@
 #include "dri_screen.h"
 #include "dri_context.h"
 #include "dri_drawable.h"
+#include "dri_query_renderer.h"
 
 DEBUG_GET_ONCE_BOOL_OPTION(swrast_no_present, "SWRAST_NO_PRESENT", FALSE);
 static boolean swrast_no_present = FALSE;
@@ -171,7 +172,7 @@ drisw_swap_buffers(__DRIdrawable *dPriv)
    ptex = drawable->textures[ST_ATTACHMENT_BACK_LEFT];
 
    if (ptex) {
-      if (ctx->pp && drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL])
+      if (ctx->pp)
          pp_run(ctx->pp, ptex, ptex, drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]);
 
       ctx->st->flush(ctx->st, ST_FLUSH_FRONT, NULL);
@@ -331,6 +332,8 @@ drisw_update_tex_buffer(struct dri_drawable *drawable,
 
 static const __DRIextension *drisw_screen_extensions[] = {
    &driTexBufferExtension.base,
+   &dri2RendererQueryExtension.base,
+   &dri2ConfigQueryExtension.base,
    NULL
 };