Hello community,
here is the log from the commit of package xgl
checked in at Fri Apr 7 17:04:36 CEST 2006.
--------
--- xgl/xgl.changes 2006-04-06 17:47:13.000000000 +0200
+++ xgl/xgl.changes 2006-04-07 11:10:01.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 7 11:09:17 CEST 2006 - dreveman@suse.de
+
+- Fix DPMS issue that caused server to hang.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xgl.spec ++++++
--- /var/tmp/diff_new_pack.lfKbvW/_old 2006-04-07 17:03:33.000000000 +0200
+++ /var/tmp/diff_new_pack.lfKbvW/_new 2006-04-07 17:03:33.000000000 +0200
@@ -23,7 +23,7 @@
PreReq: %fillup_prereq
Autoreqprov: on
Version: cvs_060405
-Release: 2
+Release: 3
Summary: Xserver that uses OpenGL for its drawing operations.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -145,6 +145,8 @@
/etc/X11/xgl-cards-white-list
%changelog -n xgl
+* Fri Apr 07 2006 - dreveman@suse.de
+- Fix DPMS issue that caused server to hang.
* Thu Apr 06 2006 - dreveman@suse.de
- Add xgl-maprules-tolower-fix.diff to fix 64bit issue in xkb
code.
++++++ xorg-server-1.1.99.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/ChangeLog new/xorg-server-1.1.99.1/ChangeLog
--- old/xorg-server-1.1.99.1/ChangeLog 2006-04-04 19:49:29.000000000 +0200
+++ new/xorg-server-1.1.99.1/ChangeLog 2006-04-07 08:24:53.000000000 +0200
@@ -1,3 +1,17 @@
+2006-04-07 David Reveman
+
+ * hw/xgl/glx/xglx.c (xglxDPMSSet): Set DPMSPowerLevel and
+ clamp level.
+
+2006-04-05 David Reveman
+
+ * hw/xgl/glxext/xglglxext.c (xglInitExtensions): Fix glWindowPos3f
+ proc address lookup.
+
+ * hw/xgl/glx/xglx.c: Add xglxPointerProc and
+ xglxChangePointerControl so that acceleration and threshold
+ can be set properly.
+
2006-04-04 David Reveman
* hw/xgl/glx/xglxorg.c (xglxInitXorg): No need to try and disable
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c
--- old/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c 2006-04-05 00:34:40.000000000 +0200
+++ new/xorg-server-1.1.99.1/hw/xgl/glx/xglx.c 2006-04-07 08:22:24.000000000 +0200
@@ -1274,8 +1274,8 @@
}
static int
-xglPointerProc (DeviceIntPtr pDevice,
- int onoff)
+xglxPointerProc (DeviceIntPtr pDevice,
+ int onoff)
{
BYTE map[MAX_BUTTONS + 1];
DevicePtr pDev = (DevicePtr) pDevice;
@@ -1317,7 +1317,7 @@
{
DeviceIntPtr pKeyboard, pPointer;
- pPointer = AddInputDevice (xglPointerProc, TRUE);
+ pPointer = AddInputDevice (xglxPointerProc, TRUE);
pKeyboard = AddInputDevice (xglxKeybdProc, TRUE);
RegisterPointerDevice (pPointer);
@@ -1564,6 +1564,16 @@
void
xglxDPMSSet (int level)
{
- if (xDpms)
- DPMSForceLevel (xdisplay, level);
+ if (!xDpms)
+ return;
+
+ if (level < 0)
+ level = DPMSModeOn;
+
+ if (level > 3)
+ level = DPMSModeOff;
+
+ DPMSPowerLevel = level;
+
+ DPMSForceLevel (xdisplay, level);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c
--- old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c 2006-04-04 12:43:47.000000000 +0200
+++ new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c 2006-04-05 23:09:25.000000000 +0200
@@ -4873,7 +4873,16 @@
"glPointParameterfvEXT");
}
- if (strstr (extensions, "GL_MESA_window_pos"))
+ if (strstr (extensions, "GL_ARB_window_pos"))
+ {
+ pContext->WindowPos3fMESA =
+ (PFNGLWINDOWPOS3FMESAPROC)
+ glitz_context_get_proc_address (pContext->context,
+ "glWindowPos3fARB");
+
+ pContext->glRenderTable.WindowPos3fvMESA = xglWindowPos3fvMESA;
+ }
+ else if (strstr (extensions, "GL_MESA_window_pos"))
{
pContext->WindowPos3fMESA =
(PFNGLWINDOWPOS3FMESAPROC)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...