xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 mi/miline.h    |   15 ---------------
 mi/miscrinit.c |    2 ++
 mi/mizerclip.c |   13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit e1e8ab3ddfd8f965ada381505480842da49fa35d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Apr 22 18:46:09 2024 +0200

    mi: miline.h: drop DEFAULTZEROLINEBIAS from public header
    
    This define in only used locally, in exactly one source file,
    thus no neeed to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1726>

diff --git a/mi/miline.h b/mi/miline.h
index 5e70e73e1..7ef3b015a 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -49,8 +49,6 @@ in this Software without prior written authorization from The Open Group.
 #define OCTANT7		(1 << (YMAJOR))
 #define OCTANT8		(1 << (0))
 
-#define DEFAULTZEROLINEBIAS	(OCTANT2 | OCTANT3 | OCTANT4 | OCTANT5)
-
 /*
  * Devices can configure the rendering of routines in mi, mfb, and cfb*
  * by specifying a thin line bias to be applied to a particular screen
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 76a3c5a96..cf67baab0 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -59,6 +59,8 @@ typedef struct {
     int ysize;
 } miScreenInitParmsRec, *miScreenInitParmsPtr;
 
+#define DEFAULTZEROLINEBIAS (OCTANT2 | OCTANT3 | OCTANT4 | OCTANT5)
+
 /* this plugs into pScreen->ModifyPixmapHeader */
 Bool
 miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
commit c06d9da5b669fd0f3aa81f5353df7cef5ada6eb4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Apr 22 18:53:04 2024 +0200

    mi: miline.h: unexport only locally used macros
    
    These macros are only used in one source file, so move them there.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1726>

diff --git a/mi/miline.h b/mi/miline.h
index 4eb4a03d5..5e70e73e1 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -106,14 +106,6 @@ extern _X_EXPORT void miSetZeroLineBias(ScreenPtr /* pScreen */ ,
      if (y > ymax) outcode |= OUT_BELOW;\
 }
 
-#define SWAPINT(i, j) \
-{  int _t = i;  i = j;  j = _t; }
-
-#define SWAPINT_PAIR(x1, y1, x2, y2)\
-{   int t = x1;  x1 = x2;  x2 = t;\
-        t = y1;  y1 = y2;  y2 = t;\
-}
-
 #define miGetZeroLineBias(_pScreen) ((unsigned long) (unsigned long*)\
     dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey))
 
@@ -137,11 +129,6 @@ extern _X_EXPORT void miSetZeroLineBias(ScreenPtr /* pScreen */ ,
 #define FIXUP_ERROR(_e, _octant, _bias) \
     (_e) -= (((_bias) >> (_octant)) & 1)
 
-#define IsXMajorOctant(_octant)		(!((_octant) & YMAJOR))
-#define IsYMajorOctant(_octant)		((_octant) & YMAJOR)
-#define IsXDecreasingOctant(_octant)	((_octant) & XDECREASING)
-#define IsYDecreasingOctant(_octant)	((_octant) & YDECREASING)
-
 extern _X_EXPORT DevPrivateKeyRec miZeroLineScreenKeyRec;
 
 #define miZeroLineScreenKey (&miZeroLineScreenKeyRec)
diff --git a/mi/mizerclip.c b/mi/mizerclip.c
index e3e2b9616..75c6f70db 100644
--- a/mi/mizerclip.c
+++ b/mi/mizerclip.c
@@ -395,6 +395,19 @@ the numerator is therefore (2^32 - 1), which does not overflow an unsigned
 #define EQN8	(T_2NDX | T_ADDDY | T_BIASSUBONE | T_DIV2DY)
 #define EQN8B	(T_2NDX | T_ADDDY | T_BIASSUBONE | T_DIV2DY)
 
+#define SWAPINT(i, j) \
+{  int _t = i;  i = j;  j = _t; }
+
+#define SWAPINT_PAIR(x1, y1, x2, y2)\
+{   int t = x1;  x1 = x2;  x2 = t;\
+        t = y1;  y1 = y2;  y2 = t;\
+}
+
+#define IsXMajorOctant(_octant)         (!((_octant) & YMAJOR))
+#define IsYMajorOctant(_octant)         ((_octant) & YMAJOR)
+#define IsXDecreasingOctant(_octant)    ((_octant) & XDECREASING)
+#define IsYDecreasingOctant(_octant)    ((_octant) & YDECREASING)
+
 /* miZeroClipLine
  *
  * returns:  1 for partially clipped line