andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xephyr: XEPHYR_DRI is identical to XF86DRI

Browse Source
This commit is contained in:
George Sapountzis 2008-04-23 17:46:30 +03:00
parent 6a9f7f28ec
commit 00effad583
11 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -1925,11 +1925,6 @@ if test "$KDRIVE" = yes; then
if test "x$XEPHYR" = xauto; then
XEPHYR=$xephyr
fi
XEPHYR_DRI=no
if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then
XEPHYR_DRI=yes
AC_DEFINE(XEPHYR_DRI,1,[enable DRI extension in xephyr])
fi
# Xephyr needs nanosleep() which is in librt on Solaris
AC_CHECK_FUNC([nanosleep], [],
@ -1984,7 +1979,6 @@ AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
AM_CONDITIONAL(XEPHYR_HAS_DRI, [test x$XEPHYR_DRI = xyes])
AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)

4
hw/kdrive/ephyr/Makefile.am
View File

@ -11,7 +11,7 @@ if XV
LIBXEPHYR_HOSTXV=libxephyr-hostxv.a
endif
if XEPHYR_HAS_DRI
if DRI
LIBXEPHYR_HOSTDRI=libxephyr-hostdri.a
endif
@ -53,7 +53,7 @@ if XV
libxephyr_hostxv_a_SOURCES = $(HOSTVIDEO_SRCS)
endif
if XEPHYR_HAS_DRI
if DRI
libxephyr_hostdri_a_SOURCES = $(HOSTDRI_SRCS)
endif

4
hw/kdrive/ephyr/XF86dri.c
View File

@ -46,8 +46,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdrive-config.h>
#endif
#ifdef XEPHYR_DRI
/* THIS IS NOT AN X CONSORTIUM STANDARD */
#define NEED_REPLIES
@ -639,5 +637,3 @@ XF86DRICloseFullScreen(Display *dpy, int screen, Drawable drawable)
(void) drawable;
return True;
}
#endif /*EPHYR_DRI*/

18
hw/kdrive/ephyr/ephyr.c
View File

@ -32,11 +32,11 @@
#include "scrnintstr.h"
#include "ephyrlog.h"
#ifdef XEPHYR_DRI
#ifdef XF86DRI
#include "ephyrdri.h"
#include "ephyrdriext.h"
#include "ephyrglxext.h"
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */
extern int KdTsPhyScreen;
#ifdef GLXEXT
@ -631,7 +631,7 @@ ephyrInitScreen (ScreenPtr pScreen)
}
#endif /*XV*/
#ifdef XEPHYR_DRI
#ifdef XF86DRI
if (!ephyrNoDRI && !hostx_has_dri ()) {
EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
ephyrNoDRI = TRUE ;
@ -841,7 +841,7 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
ephyrWarpCursor
};
#ifdef XEPHYR_DRI
#ifdef XF86DRI
/**
* find if the remote window denoted by a_remote
* is paired with an internal Window within the Xephyr server.
@ -873,7 +873,7 @@ ephyrExposePairedWindow (int a_remote)
screen->WindowExposures (pair->local, &reg, NullRegion);
REGION_UNINIT (screen, &reg);
}
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */
void
ephyrPoll(void)
@ -908,14 +908,14 @@ ephyrPoll(void)
else
{
int x=0, y=0;
#ifdef XEPHYR_DRI
#ifdef XF86DRI
EphyrWindowPair *pair = NULL;
#endif
EPHYR_LOG ("enqueuing mouse motion:%d\n", ephyrCurScreen) ;
x = ev.data.mouse_motion.x;
y = ev.data.mouse_motion.y;
EPHYR_LOG ("initial (x,y):(%d,%d)\n", x, y) ;
#ifdef XEPHYR_DRI
#ifdef XF86DRI
EPHYR_LOG ("is this window peered by a gl drawable ?\n") ;
if (findWindowPairFromRemote (ev.data.mouse_motion.window,
&pair))
@ -972,7 +972,7 @@ ephyrPoll(void)
KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
break;
#ifdef XEPHYR_DRI
#ifdef XF86DRI
case EPHYR_EV_EXPOSE:
/*
* We only receive expose events when the expose event have
@ -982,7 +982,7 @@ ephyrPoll(void)
*/
ephyrExposePairedWindow (ev.data.expose.window);
break;
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */
default:
break;

5
hw/kdrive/ephyr/ephyrdri.c
View File

@ -29,11 +29,8 @@
#include <kdrive-config.h>
#endif
#ifdef XEPHYR_DRI
#include <X11/Xutil.h>
#include <X11/Xlibint.h>
/*#define _XF86DRI_SERVER_*/
#include <GL/glx.h>
#include "xf86dri.h"
#include "hostx.h"
@ -287,5 +284,3 @@ ephyrDRIGetDeviceInfo (int a_screen,
EPHYR_LOG ("leave:%d\n", is_ok) ;
return is_ok ;
}
#endif /*EPHYR_DRI*/

4
hw/kdrive/ephyr/ephyrdriext.c
View File

@ -32,8 +32,6 @@
#include <kdrive-config.h>
#endif
#ifdef XEPHYR_DRI
#include <string.h>
#define NEED_REPLIES
@ -1439,5 +1437,3 @@ SProcXF86DRIDispatch (register ClientPtr client)
}
}
}
#endif /*XEPHYR_DRI*/

5
hw/kdrive/ephyr/ephyrglxext.c
View File

@ -42,8 +42,6 @@
#include "hostx.h"
#ifdef XEPHYR_DRI
#ifndef TRUE
#define TRUE 1
#endif
@ -727,6 +725,3 @@ ephyrGLXIsDirectSwap (__GLXclientState *a_cl, GLbyte *a_pc)
{
return ephyrGLXIsDirectReal (a_cl, a_pc, TRUE) ;
}
#endif /*XEPHYR_DRI*/

4
hw/kdrive/ephyr/ephyrhostglx.c
View File

@ -41,7 +41,6 @@
#include "ephyrlog.h"
#include "hostx.h"
#ifdef XEPHYR_DRI
enum VisualConfRequestType {
EPHYR_GET_FB_CONFIG,
EPHYR_VENDOR_PRIV_GET_FB_CONFIG_SGIX,
@ -687,6 +686,3 @@ out:
EPHYR_LOG ("leave\n") ;
return is_ok ;
}
#endif /*XEPHYR_DRI*/

11
hw/kdrive/ephyr/hostx.c
View File

@ -45,12 +45,12 @@
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
#include <X11/extensions/shape.h>
#ifdef XEPHYR_DRI
#ifdef XF86DRI
#include <GL/glx.h>
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */
#include "ephyrlog.h"
#ifdef XEPHYR_DRI
#ifdef XF86DRI
extern Bool XF86DRIQueryExtension (Display *dpy,
int *event_basep,
int *error_basep);
@ -1315,7 +1315,7 @@ hostx_has_xshape (void)
return TRUE;
}
#ifdef XEPHYR_DRI
#ifdef XF86DRI
typedef struct {
int is_valid ;
int local_id ;
@ -1418,5 +1418,4 @@ hostx_has_glx (void)
return TRUE ;
}
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */

4
hw/kdrive/ephyr/hostx.h
View File

@ -244,7 +244,7 @@ int hostx_set_window_clipping_rectangles (int a_window,
int a_num_rects) ;
int hostx_has_xshape (void) ;
#ifdef XEPHYR_DRI
#ifdef XF86DRI
int hostx_lookup_peer_window (void *a_local_window,
int *a_host_peer /*out parameter*/) ;
int
@ -256,6 +256,6 @@ hostx_get_resource_id_peer (int a_local_resource_id,
int hostx_has_dri (void) ;
int hostx_has_glx (void) ;
#endif /*XEPHYR_DRI*/
#endif /* XF86DRI */
#endif /*_XLIBS_STUFF_H_*/

2
include/dix-config.h.in
View File

@ -419,8 +419,6 @@
/* Support DRI extension */
#undef XF86DRI
#undef XEPHYR_DRI
/* Build DRI2 extension */
#undef DRI2