xserver: Branch 'master' - 2 commits
Keith Packard
keithp at kemper.freedesktop.org
Mon Apr 9 22:31:02 EEST 2007
GL/glx/glxdri.c | 6 +++++-
os/utils.c | 8 ++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
diff-tree f24391dbfd12a84253dfec794ee7884afd52e197 (from 4c2e28b0916b5f75cfefb6df9fa0a7a09675539a)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Mon Apr 9 12:30:31 2007 -0700
In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx.
As the driver EnterVT function generally re-enables the hardware and
prepares it for rendering, it must be called before any gl functions are
called which could touch the hardware.
diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 5e683a8..c30f372 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -829,12 +829,16 @@ static Bool
glxDRIEnterVT (int index, int flags)
{
__GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
+ Bool ret;
LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
+ if (!(*screen->enterVT) (index, flags))
+ return FALSE;
+
glxResumeClients();
- return (*screen->enterVT) (index, flags);
+ return TRUE;
}
static void
diff-tree 4c2e28b0916b5f75cfefb6df9fa0a7a09675539a (from 4beeab8424774ea4c3142f29b90e33f1fc7cb154)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Mon Apr 9 12:28:53 2007 -0700
Add setrlimit call in -core option to make dumps occur.
Default core size limit for most environments is 0, which disables core
dumps. Add code in the -core option processing path to set the core limit to
the maximum value.
diff --git a/os/utils.c b/os/utils.c
index e605a6c..5058285 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -64,6 +64,8 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xos.h>
#include <stdio.h>
#include <time.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include "misc.h"
#include <X11/X.h>
#define XSERV_t
@@ -795,7 +797,13 @@ ProcessCommandLine(int argc, char *argv[
UseMsg();
}
else if ( strcmp( argv[i], "-core") == 0)
+ {
+ struct rlimit core_limit;
CoreDump = TRUE;
+ getrlimit (RLIMIT_CORE, &core_limit);
+ core_limit.rlim_cur = core_limit.rlim_max;
+ setrlimit (RLIMIT_CORE, &core_limit);
+ }
else if ( strcmp( argv[i], "-dpi") == 0)
{
if(++i < argc)
More information about the xorg-commit
mailing list