From 8d9532021789645da371f12326997716ef4a3b8b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 22 Apr 2025 20:16:36 +0200 Subject: [PATCH] glamor: fix missing include of dix-config.h This header needs to be included first, otherwise things can easily get really messed up. The current code only works by accident, because some other header already including it early enough - but a subtle change in include order can easy break it. Thus, always make sure the header is really included first. Signed-off-by: Enrico Weigelt, metux IT consult --- glamor/glamor_addtraps.c | 1 + glamor/glamor_compositerects.c | 1 + glamor/glamor_egl.c | 3 +-- glamor/glamor_eglmodule.c | 3 +-- glamor/glamor_gradient.c | 1 + glamor/glamor_image.c | 1 + glamor/glamor_pixmap.c | 1 + glamor/glamor_program.c | 1 + glamor/glamor_segs.c | 1 + glamor/glamor_spans.c | 1 + glamor/glamor_sync.c | 2 +- glamor/glamor_transform.c | 1 + glamor/glamor_trapezoid.c | 1 + glamor/glamor_utils.c | 1 + glamor/glamor_vbo.c | 1 + glamor/glamor_window.c | 1 + 16 files changed, 16 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c index 7ad9f3000..723d1ff25 100644 --- a/glamor/glamor_addtraps.c +++ b/glamor/glamor_addtraps.c @@ -25,6 +25,7 @@ * Zhigang Gong * */ +#include #include "glamor_priv.h" diff --git a/glamor/glamor_compositerects.c b/glamor/glamor_compositerects.c index 0796fed41..f245cf69a 100644 --- a/glamor/glamor_compositerects.c +++ b/glamor/glamor_compositerects.c @@ -26,6 +26,7 @@ * original author is Chris Wilson at sna. * */ +#include #include "glamor_priv.h" #include "mipict.h" diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index e5b653268..11ba189a8 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -26,8 +26,7 @@ * Zhigang Gong * */ - -#include "dix-config.h" +#include #define GLAMOR_FOR_XORG #include diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c index 8ba9ba037..7dbeb050e 100644 --- a/glamor/glamor_eglmodule.c +++ b/glamor/glamor_eglmodule.c @@ -26,8 +26,7 @@ * Authors: * Zhigang Gong */ - -#include "dix-config.h" +#include #include #define GLAMOR_FOR_XORG diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 7c22ccdb2..fb41bddf3 100644 --- a/glamor/glamor_gradient.c +++ b/glamor/glamor_gradient.c @@ -29,6 +29,7 @@ * * Gradient acceleration implementation */ +#include #include "glamor_priv.h" diff --git a/glamor/glamor_image.c b/glamor/glamor_image.c index 28bdc159f..afb8a3f31 100644 --- a/glamor/glamor_image.c +++ b/glamor/glamor_image.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" #include "glamor_transfer.h" diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 625849858..772da6c03 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -26,6 +26,7 @@ * Zhigang Gong * */ +#include #include diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c index a02584fad..bf1b33ac7 100644 --- a/glamor/glamor_program.c +++ b/glamor/glamor_program.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" #include "glamor_transform.h" diff --git a/glamor/glamor_segs.c b/glamor/glamor_segs.c index 7b0108f83..4428c7b9b 100644 --- a/glamor/glamor_segs.c +++ b/glamor/glamor_segs.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" #include "glamor_program.h" diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c index 93beb61d5..ffe1bfdd0 100644 --- a/glamor/glamor_spans.c +++ b/glamor/glamor_spans.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" #include "glamor_transform.h" diff --git a/glamor/glamor_sync.c b/glamor/glamor_sync.c index 3f98be400..c6669973b 100644 --- a/glamor/glamor_sync.c +++ b/glamor/glamor_sync.c @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ - +#include #include "glamor_priv.h" #include "misyncshm.h" diff --git a/glamor/glamor_transform.c b/glamor/glamor_transform.c index 891f7ee51..ae014a87b 100644 --- a/glamor/glamor_transform.c +++ b/glamor/glamor_transform.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" #include "glamor_transform.h" diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c index a448a6b3e..405e061ac 100644 --- a/glamor/glamor_trapezoid.c +++ b/glamor/glamor_trapezoid.c @@ -29,6 +29,7 @@ * * Trapezoid acceleration implementation */ +#include #include "glamor_priv.h" diff --git a/glamor/glamor_utils.c b/glamor/glamor_utils.c index 8f085da3f..23445137e 100644 --- a/glamor/glamor_utils.c +++ b/glamor/glamor_utils.c @@ -19,6 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ +#include #include "glamor_priv.h" diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c index 3b91bd8b5..4a9914bee 100644 --- a/glamor/glamor_vbo.c +++ b/glamor/glamor_vbo.c @@ -26,6 +26,7 @@ * * Helpers for managing streamed vertex buffers used in glamor. */ +#include #include "glamor_priv.h" diff --git a/glamor/glamor_window.c b/glamor/glamor_window.c index 5fd463b43..dfb7ebbaa 100644 --- a/glamor/glamor_window.c +++ b/glamor/glamor_window.c @@ -20,6 +20,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include #include "glamor_priv.h"