summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-07-07 19:13:59 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-07-19 13:06:50 +0100
commit7791949dadd5af707055d0076874177e5e8e2133 (patch)
treea3a45f4c854e306a2f04f99d0f88d50456923042
parent225e45d45c7b836c6dc52e3ed840160c4d62f798 (diff)
swrast: add dri2ConfigQueryExtension to the correct extension list
The extension should be in the list as returned by getExtensions(). Seems to have gone unnoticed since close to nobody wants to change the vblank mode for the software driver. v2: Rebase Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
-rw-r--r--src/gallium/state_trackers/dri/dri2.c2
-rw-r--r--src/mesa/drivers/dri/swrast/swrast.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 787949ec39..f74f1d19b1 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -2004,7 +2004,7 @@ static const __DRIextension *dri_robust_screen_extensions[] = {
&dri2FlushExtension.base,
&dri2ImageExtension.base,
&dri2RendererQueryExtension.base,
- &dri2ConfigQueryExtension.base,
+ &dri2GalliumConfigQueryExtension.base,
&dri2ThrottleExtension.base,
&dri2FenceExtension.base,
&dri2InteropExtension.base,
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index c2aa4da75a..43aef9a48d 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -965,7 +965,6 @@ static const __DRIextension *swrast_driver_extensions[] = {
&driCoreExtension.base,
&driSWRastExtension.base,
&driCopySubBufferExtension.base,
- &dri2ConfigQueryExtension.base,
&swrast_vtable.base,
NULL
};