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

Revert "xfree86: move private definitions out of dri.h" 

This reverts commit cf03948572.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2027>
This commit is contained in:
Alan Coopersmith 2025-06-17 14:36:09 -07:00 committed by Marge Bot
parent 44c89ebf32
commit 41a55b1e2a
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/dri/dri.c
View File

@ -64,7 +64,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/dri/xf86driproto.h> #include <X11/dri/xf86driproto.h>
#include "swaprep.h" #include "swaprep.h"
#include "xf86str.h" #include "xf86str.h"
#include "dri_priv.h" #include "dri.h"
#include "sarea.h" #include "sarea.h"
#include "dristruct.h" #include "dristruct.h"
#include "mi.h" #include "mi.h"

2
hw/xfree86/dri/dri.h
View File

@ -195,6 +195,8 @@ extern _X_EXPORT Bool DRIScreenInit(ScreenPtr pScreen,
extern _X_EXPORT void DRICloseScreen(ScreenPtr pScreen); extern _X_EXPORT void DRICloseScreen(ScreenPtr pScreen);
extern Bool DRIExtensionInit(void);
extern _X_EXPORT void DRIReset(void); extern _X_EXPORT void DRIReset(void);
extern _X_EXPORT Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, extern _X_EXPORT Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,

12
hw/xfree86/dri/dri_priv.h
View File

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER_DRI_PRIV_H
#define _XSERVER_DRI_PRIV_H
#include "dri.h"
extern Bool DRIExtensionInit(void);
#endif /* _XSERVER_DRI_PRIV_H */

2
hw/xfree86/dri/xf86dri.c
View File

@ -57,7 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/dri/xf86driproto.h> #include <X11/dri/xf86driproto.h>
#include "swaprep.h" #include "swaprep.h"
#include "xf86str.h" #include "xf86str.h"
#include "dri_priv.h" #include "dri.h"
#include "sarea.h" #include "sarea.h"
#include "dristruct.h" #include "dristruct.h"
#include "xf86drm.h" #include "xf86drm.h"