xserver: Branch 'xgl-0-0-1' - 13 commits
David Reveman
davidr at kemper.freedesktop.org
Tue Jul 24 08:28:05 PDT 2007
composite/compext.c | 5 +++-
configure.ac | 2 -
hw/xgl/egl/Makefile.am | 48 +++++++++++++++++++++++-------------------
hw/xgl/egl/kinput.c | 2 -
hw/xgl/egl/module/Makefile.am | 2 -
hw/xgl/egl/xegl.c | 28 +++++++++++++++---------
hw/xgl/egl/xeglinit.c | 7 +++++-
hw/xgl/glx/xglx.c | 3 ++
8 files changed, 60 insertions(+), 37 deletions(-)
New commits:
diff-tree ee9cc7afec4341398e3ae60d88464a4ade9e9144 (from b57c0fb1e561a238d8d066533ea7c994c6d8ddba)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Tue Dec 5 13:44:05 2006 -0800
Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
diff --git a/composite/compext.c b/composite/compext.c
index ec5e1fa..13936fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -270,7 +270,7 @@ ProcCompositeNameWindowPixmap (ClientPtr
return BadWindow;
}
- if (!pWin->realized)
+ if (!pWin->viewable)
return BadMatch;
LEGAL_NEW_RESOURCE (stuff->pixmap, client);
diff-tree b57c0fb1e561a238d8d066533ea7c994c6d8ddba (from 2dbe6f702850606af2a3d5eb9f44b135244b1234)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Tue Dec 5 12:42:12 2006 -0800
Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
if !pWin->realized.
diff --git a/composite/compext.c b/composite/compext.c
index a7ad4e2..ec5e1fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -269,7 +269,10 @@ ProcCompositeNameWindowPixmap (ClientPtr
client->errorValue = stuff->window;
return BadWindow;
}
-
+
+ if (!pWin->realized)
+ return BadMatch;
+
LEGAL_NEW_RESOURCE (stuff->pixmap, client);
cw = GetCompWindow (pWin);
diff-tree 2dbe6f702850606af2a3d5eb9f44b135244b1234 (from bf6f5fe49f3598cce8a0c8aeb017844369de841f)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 11:08:06 2007 -0400
Update xeglInitOutput.
diff --git a/hw/xgl/egl/xegl.c b/hw/xgl/egl/xegl.c
index d1b6238..bc8657f 100644
--- a/hw/xgl/egl/xegl.c
+++ b/hw/xgl/egl/xegl.c
@@ -196,7 +196,9 @@ xeglInitOutput (ScreenInfo *pScreenInfo,
glitz_drawable_format_t *format, templ;
int i, maj, min, count;
unsigned long mask;
-
+
+ xglClearVisualTypes ();
+
xglSetPixmapFormats (pScreenInfo);
if (!eDisplay)
@@ -209,21 +211,27 @@ xeglInitOutput (ScreenInfo *pScreenInfo,
eglGetScreensMESA (eDisplay, &eScreen, 1, &count);
}
- templ.samples = 1;
- templ.doublebuffer = 1;
- templ.color.alpha_size = 8;
+ templ.samples = 1;
+ templ.color.fourcc = GLITZ_FOURCC_RGB;
- mask = GLITZ_FORMAT_SAMPLES_MASK;
+ mask = GLITZ_FORMAT_SAMPLES_MASK | GLITZ_FORMAT_FOURCC_MASK;
format = glitz_egl_find_window_config (eDisplay, eScreen,
- mask, &templ, 0);
+ mask, &templ, 0);
if (!format)
FatalError ("no visual format found");
- xglSetVisualTypesAndMasks (pScreenInfo, format, (1 << TrueColor));
-
- xglInitVisuals (pScreenInfo);
+ xglScreenInfo.depth =
+ format->color.red_size +
+ format->color.green_size +
+ format->color.blue_size;
+
+ xglSetVisualTypes (xglScreenInfo.depth,
+ (1 << TrueColor),
+ format->color.red_size,
+ format->color.green_size,
+ format->color.blue_size);
AddScreen (xeglScreenInit, argc, argv);
}
diff-tree bf6f5fe49f3598cce8a0c8aeb017844369de841f (from 5e6e824fd49e640efc2164667ee66dd362397030)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:59:45 2007 -0400
Set format variable properly.
diff --git a/hw/xgl/egl/xegl.c b/hw/xgl/egl/xegl.c
index 70db7c0..d1b6238 100644
--- a/hw/xgl/egl/xegl.c
+++ b/hw/xgl/egl/xegl.c
@@ -132,7 +132,7 @@ xeglScreenInit (int index,
screenAttribs[1] = xglScreenInfo.width;
screenAttribs[3] = xglScreenInfo.height;
- format = xglVisuals[0].format;
+ format = xglVisuals[0].format.drawable;
if (!xeglAllocatePrivates (pScreen))
return FALSE;
diff-tree 5e6e824fd49e640efc2164667ee66dd362397030 (from 36aa6d9b46c39783f570e83863b5e653c257443d)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:46:17 2007 -0400
Update AM_CFLAGS for egl.
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index 28d4cb5..864dd67 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -8,10 +8,16 @@ SUBDIRS = \
. \
$(XGL_MODULE_DIRS)
-AM_CFLAGS = \
- @SERVER_DEFINES@ \
- -DHAVE_XGL_CONFIG_H \
- -DHAVE_DIX_CONFIG_H \
+AM_CFLAGS = \
+ -I$(top_srcdir)/hw/xgl \
+ -I$(top_srcdir)/hw/xgl/glxext \
+ -I$(top_srcdir)/GL/glx \
+ -I$(top_srcdir)/GL/include \
+ -I at MESA_SOURCE@/include \
+ -I at MESA_SOURCE@/src/mesa/glapi \
+ @SERVER_DEFINES@ \
+ -DHAVE_XGL_CONFIG_H \
+ -DHAVE_DIX_CONFIG_H \
$(XEGLMODULES_CFLAGS)
noinst_LTLIBRARIES = libxegl.la
diff-tree 36aa6d9b46c39783f570e83863b5e653c257443d (from fa33dbc7481db1d2f61e4f67cc8874a583e97efa)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:44:09 2007 -0400
Disable building of Xegl binary.
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index a3931fd..28d4cb5 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -24,22 +24,22 @@ libxegl_la_SOURCES = \
kinput.c \
evdev.c
-Xegl_DEPENDENCIES = @XEGL_LIBS@
-Xegl_LDFLAGS = -export-dynamic
-Xegl_SOURCES = \
- xeglinit.c \
- $(top_srcdir)/mi/miinitext.c \
- $(top_srcdir)/Xext/dpmsstubs.c \
- $(top_srcdir)/Xi/stubs.c \
- $(top_srcdir)/fb/fbcmap.c
-Xegl_LDADD = \
- libxegl.la \
- $(top_builddir)/hw/xgl/libxgl.a \
- $(XORG_CORE_LIBS) \
- $(XEGL_LIBS) \
- $(XSERVER_LIBS) \
- $(EXTENSION_LIBS) \
- $(XEGLMODULES_LIBS)
-Xegl_programs = Xegl
+#Xegl_DEPENDENCIES = @XEGL_LIBS@
+#Xegl_LDFLAGS = -export-dynamic
+#Xegl_SOURCES = \
+# xeglinit.c \
+# $(top_srcdir)/mi/miinitext.c \
+# $(top_srcdir)/Xext/dpmsstubs.c \
+# $(top_srcdir)/Xi/stubs.c \
+# $(top_srcdir)/fb/fbcmap.c
+#Xegl_LDADD = \
+# libxegl.la \
+# $(top_builddir)/hw/xgl/libxgl.a \
+# $(XORG_CORE_LIBS) \
+# $(XEGL_LIBS) \
+# $(XSERVER_LIBS) \
+# $(EXTENSION_LIBS) \
+# $(XEGLMODULES_LIBS)
+#Xegl_programs = Xegl
bin_PROGRAMS = $(Xegl_programs)
diff-tree fa33dbc7481db1d2f61e4f67cc8874a583e97efa (from ded170478de102c4146f98929f76f33eaadd1ac9)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:42:14 2007 -0400
Fix another EGL Makefile.am typo.
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index a9370b3..a3931fd 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -39,7 +39,7 @@ Xegl_LDADD = \
$(XEGL_LIBS) \
$(XSERVER_LIBS) \
$(EXTENSION_LIBS) \
- $(XGLXMODULES_LIBS)
+ $(XEGLMODULES_LIBS)
Xegl_programs = Xegl
bin_PROGRAMS = $(Xegl_programs)
diff-tree ded170478de102c4146f98929f76f33eaadd1ac9 (from 09b6c1a3c6f578a05edf0337e3e2006c2839184a)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:38:23 2007 -0400
Add missing implementation of ddxInitGlobals.
diff --git a/hw/xgl/egl/xeglinit.c b/hw/xgl/egl/xeglinit.c
index d8c7883..08007b6 100644
--- a/hw/xgl/egl/xeglinit.c
+++ b/hw/xgl/egl/xeglinit.c
@@ -143,6 +143,11 @@ OsVendorInit (void)
xeglOsVendorInit ();
}
+void
+ddxInitGlobals (void)
+{
+}
+
Bool
DPMSSupported (void)
{
diff-tree 09b6c1a3c6f578a05edf0337e3e2006c2839184a (from 6ed0ef813c80d296ce3d4c90fce8303942357a7e)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:33:00 2007 -0400
xglScreenInfo should not be static.
diff --git a/hw/xgl/egl/xeglinit.c b/hw/xgl/egl/xeglinit.c
index b10873d..d8c7883 100644
--- a/hw/xgl/egl/xeglinit.c
+++ b/hw/xgl/egl/xeglinit.c
@@ -25,7 +25,7 @@
#include "xegl.h"
-static xglScreenInfoRec xglScreenInfo = {
+xglScreenInfoRec xglScreenInfo = {
NULL, 0, 0, 0, 0,
DEFAULT_GEOMETRY_DATA_TYPE,
DEFAULT_GEOMETRY_USAGE,
diff-tree 6ed0ef813c80d296ce3d4c90fce8303942357a7e (from c22ec63cf4462ae3d17d78f8aca8bfeeff81fe93)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:30:16 2007 -0400
Remove dispatchException. Already defined in opaque.h.
diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c
index 90997d2..34ceac0 100644
--- a/hw/xgl/egl/kinput.c
+++ b/hw/xgl/egl/kinput.c
@@ -1127,8 +1127,6 @@ KdReceiveTimeout (KdMouseInfo *mi)
CARD32 KdSpecialKeys = 0;
-extern char dispatchException;
-
/*
* kdCheckTermination
*
diff-tree c22ec63cf4462ae3d17d78f8aca8bfeeff81fe93 (from d2c784d356e23849ee1b7d85fde9fb5b29ecc760)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:28:56 2007 -0400
Fix EGL build typo.
diff --git a/hw/xgl/egl/module/Makefile.am b/hw/xgl/egl/module/Makefile.am
index 813bfe7..b64994e 100644
--- a/hw/xgl/egl/module/Makefile.am
+++ b/hw/xgl/egl/module/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = \
libxegl_la_LDFLAGS = -avoid-version
libxegl_la_SOURCES = xeglmodule.c
libxegl_la_LIBADD = \
- $(top_builddir)/hw/xgl/glx/libxegl.la \
+ $(top_builddir)/hw/xgl/egl/libxegl.la \
$(XEGLMODULES_LIBS)
moduledir = @xglmoduledir@
diff-tree d2c784d356e23849ee1b7d85fde9fb5b29ecc760 (from ab28b7e8fec6e579806c42b194170be90b29aea8)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 10:26:44 2007 -0400
Fix EGL typo in configure.ac.
diff --git a/configure.ac b/configure.ac
index 2ae2ca8..cf3eb98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1008,7 +1008,7 @@ dnl Xegl DDX
AC_MSG_CHECKING([whether to build Xegl DDX])
if test "x$XEGL" != xno; then
- PKG_CHECK_MODULES([XGLMODULES], [glitz-egl >= $XGL_REQUIRED_GLITZ_VERSION], [XEGL=yes], [XEGL=no])
+ PKG_CHECK_MODULES([XEGLMODULES], [glitz-egl >= $XGL_REQUIRED_GLITZ_VERSION], [XEGL=yes], [XEGL=no])
AC_SUBST(XEGLMODULES_CFLAGS)
AC_SUBST(XEGLMODULES_LIBS)
fi
diff-tree ab28b7e8fec6e579806c42b194170be90b29aea8 (from 3336ff91de2aa35277178f39b8d025e324ae5122)
Author: David Reveman <davidr at novell.com>
Date: Tue Jul 24 09:45:43 2007 -0400
Avoid redirected windows in expose handler.
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 7e165b4..a568770 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -415,6 +415,9 @@ xglxWindowExposures (WindowPtr pWin,
ScreenPtr pScreen = pWin->drawable.pScreen;
RegionRec ClipList;
+ if (pWin->redirectDraw)
+ return WT_DONTWALKCHILDREN;
+
if (HasBorder (pWin))
{
REGION_INIT (pScreen, &ClipList, NullBox, 0);
More information about the xorg-commit
mailing list