aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/include')
-rw-r--r--nx-X11/include/Imakefile4
-rw-r--r--nx-X11/include/extensions/Imakefile12
-rw-r--r--nx-X11/include/extensions/xf86rush.h113
-rw-r--r--nx-X11/include/extensions/xf86rushstr.h163
4 files changed, 5 insertions, 287 deletions
diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile
index e46abbdfd..26520eab0 100644
--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -10,7 +10,7 @@ NULL =
#define IHaveSubdirs
#define PassCDebugFlags /**/
-#if BuildGlxExt || BuildGLXLibrary
+#if BuildGlxExt
GLXDIR = GL
#endif
@@ -82,7 +82,7 @@ clean::
-$(RM) Xpoll.h
XCOMM For the Linux/OpenGL base standard
-#if LinkGLToUsrInclude && AlternateIncRoot
+#if AlternateIncRoot
install::
MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR))
-$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index 68198698f..ec6c10b98 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -12,16 +12,16 @@ NULL =
SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
#endif
-#if BuildXF86MiscExt || BuildXF86MiscLibrary
+#if BuildXF86MiscExt
XF86MISCHEADERS = xf86misc.h xf86mscstr.h
#endif
#if BuildXF86BigfontExt
XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h
#endif
-#if BuildXF86VidModeExt || BuildXF86VidModeLibrary
+#if BuildXF86VidModeExt
XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
#endif
-#if BuildXF86DGA || BuildXF86DGALibrary
+#if BuildXF86DGA
XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
#endif
#if BuildXextLib
@@ -32,9 +32,6 @@ LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
XVHEADERS = Xv.h Xvlib.h Xvproto.h
XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
#endif
-#if BuildXF86RushExt || BuildXF86RushLibrary
-XF86RUSHHEADERS = xf86rush.h xf86rushstr.h
-#endif
#if BuildFontCache
FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h
#endif
@@ -71,7 +68,6 @@ EXTRAHEADERS = \
$(LBXHEADERS) \
$(XVHEADERS) \
$(XVMCHEADERS) \
- $(XF86RUSHHEADERS) \
$(FONTCACHEHEADERS) \
$(RENDERHEADERS) \
$(XFIXESHEADERS) \
@@ -119,8 +115,6 @@ InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(xf86dga1str.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions)
-InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/nx-X11/include/extensions/xf86rush.h b/nx-X11/include/extensions/xf86rush.h
deleted file mode 100644
index 1db7d13ec..000000000
--- a/nx-X11/include/extensions/xf86rush.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86rush.h,v 1.4 2000/02/29 03:09:00 dawes Exp $ */
-/*
-
-Copyright (c) 1998 Daryll Strauss
-
-*/
-
-#ifndef _XF86RUSH_H_
-#define _XF86RUSH_H_
-
-#include <X11/extensions/Xv.h>
-#include <X11/Xfuncproto.h>
-
-#define X_XF86RushQueryVersion 0
-#define X_XF86RushLockPixmap 1
-#define X_XF86RushUnlockPixmap 2
-#define X_XF86RushUnlockAllPixmaps 3
-#define X_XF86RushGetCopyMode 4
-#define X_XF86RushSetCopyMode 5
-#define X_XF86RushGetPixelStride 6
-#define X_XF86RushSetPixelStride 7
-#define X_XF86RushOverlayPixmap 8
-#define X_XF86RushStatusRegOffset 9
-#define X_XF86RushAT3DEnableRegs 10
-#define X_XF86RushAT3DDisableRegs 11
-
-#define XF86RushNumberEvents 0
-
-#define XF86RushClientNotLocal 0
-#define XF86RushNumberErrors (XF86RushClientNotLocal + 1)
-
-#ifndef _XF86RUSH_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XF86RushQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool XF86RushQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Bool XF86RushLockPixmap(
- Display * /* dpy */,
- int /* screen */,
- Pixmap /* Pixmap */,
- void ** /* Return address */
-);
-
-Bool XF86RushUnlockPixmap(
- Display * /* dpy */,
- int /* screen */,
- Pixmap /* Pixmap */
-);
-
-Bool XF86RushUnlockAllPixmaps(
- Display * /* dpy */
-);
-
-Bool XF86RushSetCopyMode(
- Display * /* dpy */,
- int /* screen */,
- int /* copy mode */
-);
-
-Bool XF86RushSetPixelStride(
- Display * /* dpy */,
- int /* screen */,
- int /* pixel stride */
-);
-
-Bool XF86RushOverlayPixmap(
- Display * /* dpy */,
- XvPortID /* port */,
- Drawable /* d */,
- GC /* gc */,
- Pixmap /* pixmap */,
- int /* src_x */,
- int /* src_y */,
- unsigned int /* src_w */,
- unsigned int /* src_h */,
- int /* dest_x */,
- int /* dest_y */,
- unsigned int /* dest_w */,
- unsigned int /* dest_h */,
- unsigned int /* id */
-);
-
-int XF86RushStatusRegOffset(
- Display * /* dpy */,
- int /* screen */
-);
-
-Bool XF86RushAT3DEnableRegs(
- Display * /* dpy */,
- int /* screen */
-);
-
-Bool XF86RushAT3DDisableRegs(
- Display * /* dpy */,
- int /* screen */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XF86RUSH_SERVER_ */
-
-#endif /* _XF86RUSH_H_ */
diff --git a/nx-X11/include/extensions/xf86rushstr.h b/nx-X11/include/extensions/xf86rushstr.h
deleted file mode 100644
index 8dca46a76..000000000
--- a/nx-X11/include/extensions/xf86rushstr.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.4 2000/02/29 03:09:02 dawes Exp $ */
-/*
-
-Copyright (c) 1998 Daryll Strauss
-
-*/
-
-#ifndef _XF86RUSHSTR_H_
-#define _XF86RUSHSTR_H_
-
-#include <X11/extensions/xf86rush.h>
-
-#define XF86RUSHNAME "XFree86-Rush"
-
-#define XF86RUSH_MAJOR_VERSION 1 /* current version numbers */
-#define XF86RUSH_MINOR_VERSION 1
-
-typedef struct _XF86RushQueryVersion {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushQueryVersion */
- CARD16 length B16;
-} xXF86RushQueryVersionReq;
-#define sz_xXF86RushQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Rush protocol */
- CARD16 minorVersion B16; /* minor version of Rush protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86RushQueryVersionReply;
-#define sz_xXF86RushQueryVersionReply 32
-
-typedef struct _XF86RushLockPixmap {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushLockPixmap */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pixmap B32;
-} xXF86RushLockPixmapReq;
-#define sz_xXF86RushLockPixmapReq 12
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 addr B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86RushLockPixmapReply;
-#define sz_xXF86RushLockPixmapReply 32
-
-typedef struct _XF86RushUnlockPixmap {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushUnlockPixmap */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pixmap B32;
-} xXF86RushUnlockPixmapReq;
-#define sz_xXF86RushUnlockPixmapReq 12
-
-typedef struct _XF86RushUnlockAllPixmaps {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushUnlockAllPixmaps */
- CARD16 length B16;
-} xXF86RushUnlockAllPixmapsReq;
-#define sz_xXF86RushUnlockAllPixmapsReq 4
-
-typedef struct _XF86RushSetCopyMode {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushSetCopyMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 CopyMode B32;
-} xXF86RushSetCopyModeReq;
-#define sz_xXF86RushSetCopyModeReq 12
-
-
-typedef struct _XF86RushSetPixelStride {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushSetCopyMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 PixelStride B32;
-} xXF86RushSetPixelStrideReq;
-#define sz_xXF86RushSetPixelStrideReq 12
-
-typedef struct {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushOverlayPixmap */
- CARD16 length B16;
- XvPortID port B32;
- Drawable drawable B32;
- GContext gc B32;
- Pixmap pixmap B32;
- CARD32 id B32;
- INT16 src_x B16;
- INT16 src_y B16;
- CARD16 src_w B16;
- CARD16 src_h B16;
- INT16 drw_x B16;
- INT16 drw_y B16;
- CARD16 drw_w B16;
- CARD16 drw_h B16;
-} xXF86RushOverlayPixmapReq;
-#define sz_xXF86RushOverlayPixmapReq 40
-
-typedef struct _XF86RushStatusRegOffset {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushStatusRegOffset */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86RushStatusRegOffsetReq;
-#define sz_xXF86RushStatusRegOffsetReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32; /* Offset of Rush status reg in mem */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86RushStatusRegOffsetReply;
-#define sz_xXF86RushStatusRegOffsetReply 32
-
-typedef struct _XF86RushAT3DEnableRegs {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushAT3DEnableRegs */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86RushAT3DEnableRegsReq;
-#define sz_xXF86RushAT3DEnableRegsReq 8
-
-typedef struct _XF86RushAT3DDisableRegs {
- CARD8 reqType; /* always RushReqCode */
- CARD8 rushReqType; /* always X_RushAT3DDisableRegs */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86RushAT3DDisableRegsReq;
-#define sz_xXF86RushAT3DDisableRegsReq 8
-
-#endif /* _XF86RUSHSTR_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:40:21 +0000