frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge a24a7a7a66 into d403cbd25c

This commit is contained in:
Enrico Weigelt 2025-07-04 11:26:19 -07:00 committed by GitHub
parent d403cbd25c a24a7a7a66
commit 3abf6f40e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fb/fbbits.h
View File

@ -24,15 +24,10 @@
* This file defines functions for drawing some primitives using * This file defines functions for drawing some primitives using
* underlying datatypes instead of masks * underlying datatypes instead of masks
*/ */
#include "fb/fb_priv.h"
#define isClipped(c,ul,lr) (((c) | ((c) - (ul)) | ((lr) - (c))) & 0x80008000) #define isClipped(c,ul,lr) (((c) | ((c) - (ul)) | ((lr) - (c))) & 0x80008000)
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "fb/fb_priv.h"
#define __FbMaskBits(x,w,l,n,r) { \ #define __FbMaskBits(x,w,l,n,r) { \
n = (w); \ n = (w); \
r = FbRightMask((x)+n); \ r = FbRightMask((x)+n); \

5
fb/fbpict.h
View File

@ -20,11 +20,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _FBPICT_H_ #ifndef _FBPICT_H_
#define _FBPICT_H_ #define _FBPICT_H_

1
glamor/glamor.h
View File

@ -34,7 +34,6 @@
#include <gcstruct.h> #include <gcstruct.h>
#include <picturestr.h> #include <picturestr.h>
#include <fb.h> #include <fb.h>
#include <fbpict.h>
#ifdef GLAMOR_FOR_XORG #ifdef GLAMOR_FOR_XORG
#include <xf86xv.h> #include <xf86xv.h>
#endif #endif

2
glamor/glamor_addtraps.c
View File

@ -27,6 +27,8 @@
*/ */
#include <dix-config.h> #include <dix-config.h>
#include "fb/fbpict.h"
#include "glamor_priv.h" #include "glamor_priv.h"
void void