Mesa (main): egl: Just include driconf.h instead of redefining its values.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4c6a1e3f3324f65e9bffc284e77fb0a8125c409f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c6a1e3f3324f65e9bffc284e77fb0a8125c409f

Author: Emma Anholt <emma at anholt.net>
Date:   Mon Jul 11 12:37:38 2022 -0700

egl: Just include driconf.h instead of redefining its values.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17470>

---

 src/egl/drivers/dri2/egl_dri2.c | 1 +
 src/egl/drivers/dri2/egl_dri2.h | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 3682d05be95..87ea2bdb3de 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -68,6 +68,7 @@
 #include "util/u_vector.h"
 #include "mapi/glapi/glapi.h"
 #include "util/bitscan.h"
+#include "util/driconf.h"
 #include "util/u_math.h"
 
 #define NUM_ATTRIBS 12
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
index 1c840a966b3..056bc2e099a 100644
--- a/src/egl/drivers/dri2/egl_dri2.h
+++ b/src/egl/drivers/dri2/egl_dri2.h
@@ -417,12 +417,6 @@ struct dri2_egl_sync {
    void *fence;
 };
 
-/* From driconf.h, user exposed so should be stable */
-#define DRI_CONF_VBLANK_NEVER 0
-#define DRI_CONF_VBLANK_DEF_INTERVAL_0 1
-#define DRI_CONF_VBLANK_DEF_INTERVAL_1 2
-#define DRI_CONF_VBLANK_ALWAYS_SYNC 3
-
 /* standard typecasts */
 _EGL_DRIVER_STANDARD_TYPECASTS(dri2_egl)
 _EGL_DRIVER_TYPECAST(dri2_egl_image, _EGLImage, obj)